[asterisk-commits] rizzo: trunk r95625 - in /trunk/codecs: Makefile codec_resample.c

[SVN commits to the Asterisk project]

Author: rizzo
Date: Tue Jan  1 16:21:39 2008
New Revision: 95625

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95625
Log:
make codec_resample build on __CYGWIN__, and make it load on FreeBSD
(and probably other systems as well).
Both need libresample.a to be specified in the linking phase,
and cygwin needs <float.h> as other BSD.

The checks for OS-specific headers should really be moved to some
common header though.


Modified:
    trunk/codecs/Makefile
    trunk/codecs/codec_resample.c

Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?view=diff&rev=95625&r1=95624&r2=95625
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Tue Jan  1 16:21:39 2008
@@ -56,3 +56,4 @@
 $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
 
 codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include
+codec_resample.so: LIBS += $(ASTTOPDIR)/main/libresample/libresample.a

Modified: trunk/codecs/codec_resample.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_resample.c?view=diff&rev=95625&r1=95624&r2=95625
==============================================================================
--- trunk/codecs/codec_resample.c (original)
+++ trunk/codecs/codec_resample.c Tue Jan  1 16:21:39 2008
@@ -29,7 +29,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 /* These are for SHRT_MAX and FLT_MAX -- { */
-#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) 
+#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__)
 #include <float.h>
 #else
 #include <values.h>