From: Eric Petit <titer@videolan.org>
Date: Wed, 28 Jul 2004 21:39:06 +0000 (+0000)
Subject:  BeOS fixes (no stdint.h, no libm)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0495a99ee0b65b03be7d6961ddb70ef7e38dcf0;p=libx264

 BeOS fixes (no stdint.h, no libm)


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

diff --git a/Jamfile b/Jamfile
index 43b0a536..370aa3b2 100644
--- a/Jamfile
+++ b/Jamfile
@@ -40,11 +40,17 @@ if $(OSPLAT) = X86
     SOURCES_X264 += $(SOURCES_X86) ;
     ASFLAGS       = -f elf ;
 
+    if $(OS) != BEOS
+    {
+        DEFINES += HAVE_STDINT_H ;
+    }
+
     # Don't ask
     NOARUPDATE = false ;
 }
 if $(OSPLAT) = PPC
 {
+    DEFINES      += HAVE_STDINT_H ;
     SOURCES_X264 += $(SOURCES_ALTIVEC) ;
     OPTIM        += -falign-loops=16 ;
 
@@ -60,7 +66,10 @@ if $(OSPLAT) = PPC
 Library libx264 : $(SOURCES_X264) ;
 
 # x264
-LINKLIBS += -lm ;
+if $(OS) != BEOS
+{
+    LINKLIBS += -lm ;
+}
 LinkLibraries x264 : libx264.a ;
 Main x264 : x264.c ;
 
diff --git a/core/cabac.c b/core/cabac.c
index 51a06e2c..27d7d0c0 100644
--- a/core/cabac.c
+++ b/core/cabac.c
@@ -20,9 +20,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
+
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 #include <stdio.h>
 
 #include "common.h"
diff --git a/core/common.c b/core/common.c
index b44d9cd6..a4a21d44 100644
--- a/core/common.c
+++ b/core/common.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
diff --git a/core/common.h b/core/common.h
index e5c85c05..11b9fae9 100644
--- a/core/common.h
+++ b/core/common.h
@@ -24,7 +24,11 @@
 #ifndef _COMMON_H
 #define _COMMON_H 1
 
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
 
 #include "../x264.h"
 #include "bs.h"
diff --git a/core/cpu.c b/core/cpu.c
index 9df01da4..5cce5db0 100644
--- a/core/cpu.c
+++ b/core/cpu.c
@@ -21,9 +21,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "../x264.h"
 #include "cpu.h"
diff --git a/core/csp.c b/core/csp.c
index 1dda6b60..dbd990f2 100644
--- a/core/csp.c
+++ b/core/csp.c
@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 
 #include "common.h"
diff --git a/core/dct.c b/core/dct.c
index 6e3a16fc..da018287 100644
--- a/core/dct.c
+++ b/core/dct.c
@@ -21,8 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
+#include <stdlib.h>
 
 #include "x264.h"
 
diff --git a/core/frame.c b/core/frame.c
index 2e926176..02a5b540 100644
--- a/core/frame.c
+++ b/core/frame.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "common.h"
 #include "macroblock.h"
diff --git a/core/i386/dct-c.c b/core/i386/dct-c.c
index d824a23f..368603e0 100644
--- a/core/i386/dct-c.c
+++ b/core/i386/dct-c.c
@@ -21,8 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
+#include <stdlib.h>
 
 #include "x264.h"
 
diff --git a/core/i386/mc-c.c b/core/i386/mc-c.c
index bec61db4..08207c17 100644
--- a/core/i386/mc-c.c
+++ b/core/i386/mc-c.c
@@ -21,10 +21,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "x264.h"   /* DECLARE_ALIGNED */
 #include "../mc.h"
diff --git a/core/i386/predict.c b/core/i386/predict.c
index 587416bd..ef1a027d 100644
--- a/core/i386/predict.c
+++ b/core/i386/predict.c
@@ -24,8 +24,12 @@
 /* XXX predict4x4 are inspired from ffmpeg h264 decoder
  */
 
-#include <stdlib.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
+#include <stdlib.h>
 
 #include "x264.h"   /* for keyword inline */
 #include "../predict.h"
diff --git a/core/macroblock.c b/core/macroblock.c
index d03413c6..4d305737 100644
--- a/core/macroblock.c
+++ b/core/macroblock.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "common.h"
 #include "macroblock.h"
diff --git a/core/mc.c b/core/mc.c
index fbb548d5..ae9c6685 100644
--- a/core/mc.c
+++ b/core/mc.c
@@ -21,10 +21,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "../x264.h"
 
diff --git a/core/mdate.c b/core/mdate.c
index 5b4a2a91..2ce92b65 100644
--- a/core/mdate.c
+++ b/core/mdate.c
@@ -21,8 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
+#include <stdlib.h>
 
 #if !(defined(_MSC_VER) || defined(__MINGW32__))
 #include <sys/time.h>
diff --git a/core/pixel.c b/core/pixel.c
index 7fa93f2a..056491ca 100644
--- a/core/pixel.c
+++ b/core/pixel.c
@@ -21,9 +21,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "../x264.h"
 #include "pixel.h"
diff --git a/core/predict.c b/core/predict.c
index 6a799a09..2df27394 100644
--- a/core/predict.c
+++ b/core/predict.c
@@ -24,8 +24,12 @@
 /* XXX predict4x4 are inspired from ffmpeg h264 decoder
  */
 
-#include <stdlib.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
+#include <stdlib.h>
 
 #include "x264.h"
 #include "predict.h"
diff --git a/encoder/analyse.c b/encoder/analyse.c
index e4a7a025..aaca97e0 100644
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 #include <math.h>
 
 #include "../core/common.h"
diff --git a/encoder/cabac.c b/encoder/cabac.c
index 8b1f3965..cbb806a1 100644
--- a/encoder/cabac.c
+++ b/encoder/cabac.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "../core/common.h"
 #include "macroblock.h"
diff --git a/encoder/cavlc.c b/encoder/cavlc.c
index de7ba547..5560b249 100644
--- a/encoder/cavlc.c
+++ b/encoder/cavlc.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "../core/common.h"
 #include "../core/vlc.h"
diff --git a/encoder/encoder.c b/encoder/encoder.c
index 3188bb73..f9c03105 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include <math.h>
 
diff --git a/encoder/macroblock.c b/encoder/macroblock.c
index 17bea963..21a097e9 100644
--- a/encoder/macroblock.c
+++ b/encoder/macroblock.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "../core/common.h"
 #include "macroblock.h"
diff --git a/encoder/me.c b/encoder/me.c
index b1653754..86396f3b 100644
--- a/encoder/me.c
+++ b/encoder/me.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "../core/common.h"
 #include "me.h"
diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 56a5af9b..fc0226e7 100644
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "../core/common.h"
 #include "ratecontrol.h"
diff --git a/encoder/set.c b/encoder/set.c
index 56284642..9b4a8de5 100644
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -21,10 +21,14 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include "../x264.h"
 #include "../core/bs.h"
diff --git a/x264.c b/x264.c
index 75c347b6..57254eac 100644
--- a/x264.c
+++ b/x264.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
 
 #include <math.h>
 
@@ -37,8 +36,8 @@
 #include <fcntl.h>  /* _O_BINARY */
 #endif
 
-#include "x264.h"
 #include "core/common.h"
+#include "x264.h"
 
 #define DATA_MAX 3000000
 uint8_t data[DATA_MAX];