fix compilation on FreeBSD (from Loren Merritt (thanks to Igla))

git-svn-id: svn://svn.videolan.org/x264/trunk@51 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/Jamfile b/Jamfile
index 652ed6d92712d1116974e0d67e9b6380e9d76468..df0ce44db08ce7e8f7e74e66c559ac90cbf55c2a 100644 (file)
--- a/Jamfile
+++ b/Jamfile
@@ -35,7 +35,7 @@ SOURCES_ALTIVEC = core/ppc/mc.c core/ppc/pixel.c ;
 SOURCES_X264 = $(SOURCES_C) ;
 if $(OSPLAT) = X86
 {
-    DEFINES      += HAVE_MALLOC_H HAVE_MMXEXT HAVE_SSE2 ;
+    DEFINES      += HAVE_MMXEXT HAVE_SSE2 ;
     SOURCES_X264 += $(SOURCES_MMX) ;
     SOURCES_X264 += $(SOURCES_X86) ;
     ASFLAGS       = -f elf ;
@@ -44,6 +44,10 @@ if $(OSPLAT) = X86
     {
         DEFINES += HAVE_STDINT_H ;
     }
+    if $(OS) != FREEBSD
+    {
+        DEFINES += HAVE_MALLOC_H ;
+    }
 
     # Don't ask
     NOARUPDATE = false ;

diff --git a/Makefile b/Makefile
index a5f51812a4a2e5dedfc40c62f2337903a3726b11..4a8fe5f08b1314ec3a6c131962cbc99859a8e7d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 #  SRCS: core/ppc/mc.c core/ppc/pixel.c 
 #  Defines: HAVE_PPC
 #  CFLAGS: -faltivec
+# For FreeBSD, remove -DHAVE_MALLOC_H and add -DSYS_FREEBSD
 #
 PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -DHAVE_SSE2
 CC=gcc

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 07612634e99ad8e0a881f1b6872fe01033365401..b38bfb515cdf09ea9f79760e772d014c348117dd 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -40,6 +40,9 @@
 #ifdef SYS_MACOSX
 #define exp2f(x) ( (float) exp2( (x) ) )
 #endif
+#ifdef SYS_FREEBSD
+#define exp2f(x) powf( 2, (x) )
+#endif
 
 
 typedef struct