configure: add QNX support
authorMike Gorchak <mike.gorchak.qnx@gmail.com>
Sun, 3 Feb 2013 07:35:00 +0000 (23:35 -0800)
committerJason Garrett-Glaser <jason@x264.com>
Mon, 25 Feb 2013 20:14:33 +0000 (12:14 -0800)
common/common.c
configure
x264.h

index 0efe6d3..de6e9ff 100644 (file)
@@ -563,6 +563,8 @@ static double x264_atof( const char *str, int *b_error )
 }
 
 #define atobool(str) ( name_was_bool = 1, x264_atobool( str, &b_error ) )
+#undef atoi
+#undef atof
 #define atoi(str) x264_atoi( str, &b_error )
 #define atof(str) x264_atof( str, &b_error )
 
index 4d663aa..c974ba4 100755 (executable)
--- a/configure
+++ b/configure
@@ -521,6 +521,13 @@ case $host_os in
         fi
         HAVE_GETOPT_LONG=0
         ;;
+    *qnx*)
+        SYS="QNX"
+        define HAVE_MALLOC_H
+        libm="-lm"
+        HAVE_GETOPT_LONG=0
+        CFLAGS="$CFLAGS -I\$(SRCPATH)/extras"
+        ;;
     *)
         die "Unknown system $host, edit the configure"
         ;;
@@ -772,6 +779,9 @@ if [ "$thread" = "auto" ]; then
                 thread="win32"
             fi
             ;;
+        QNX)
+            cc_check pthread.h -lc && thread="posix" && libpthread="-lc"
+            ;;
         *)
             cc_check pthread.h -lpthread && thread="posix" && libpthread="-lpthread"
             ;;
diff --git a/x264.h b/x264.h
index 7f59a38..ff70817 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -28,7 +28,7 @@
 #ifndef X264_X264_H
 #define X264_X264_H
 
-#if !defined(_STDINT_H) && !defined(_STDINT_H_) && \
+#if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_STDINT_H_INCLUDED) &&\
     !defined(_INTTYPES_H) && !defined(_INTTYPES_H_)
 # ifdef _MSC_VER
 #  pragma message("You must include stdint.h or inttypes.h before x264.h")