remove private stuff from public headers. no more need for -D__X264__

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

diff --git a/common/common.h b/common/common.h
index 2bd0552bfa12a6e0059ed1cba45fa0fbb120f6cc..dd055f5ed88f448f66c5c84032d91c5d46d4042b 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -34,6 +34,8 @@
 #include <assert.h>
 
 #ifdef _MSC_VER
+#define inline __inline
+#define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
 #define snprintf _snprintf
 #define X264_VERSION "" // no configure script for msvc
 #endif
@@ -45,6 +47,12 @@
 #define x264_alloca(x) (void*)(((intptr_t) alloca((x)+15)+15)&~15)
 #endif
 
+#ifdef _MSC_VER
+#define DECLARE_ALIGNED( type, var, n ) __declspec(align(n)) type var
+#else
+#define DECLARE_ALIGNED( type, var, n ) type var __attribute__((aligned(n)))
+#endif
+
 /* threads */
 #if defined(__WIN32__) && defined(HAVE_PTHREAD)
 #include <pthread.h>

diff --git a/configure b/configure
index b7152be5502dc45838a6c24d2470a45533b7b19d..b6e0d9e821c4d889e43f4a595eff2c9d6dee6996 100755 (executable)
--- a/configure
+++ b/configure
@@ -64,7 +64,7 @@ vis="no"
 shared="no"
 
 CC="${CC-gcc}"
-CFLAGS="$CFLAGS -Wall -I. -D__X264__"
+CFLAGS="$CFLAGS -Wall -I."
 LDFLAGS="$LDFLAGS"
 HAVE_GETOPT_LONG=1
 

diff --git a/x264.h b/x264.h
index cbddbee7227776a03bb702895d7207fc6502e5c9..630446dcb57ccfc6422b4f0060f1fb8656a7585d 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -408,17 +408,4 @@ int     x264_encoder_encode ( x264_t *, x264_nal_t **, int *, x264_picture_t *,
  *      close an encoder handler */
 void    x264_encoder_close  ( x264_t * );
 
-/****************************************************************************
- * Private stuff for internal usage:
- ****************************************************************************/
-#ifdef __X264__
-#   ifdef _MSC_VER
-#       define inline __inline
-#       define DECLARE_ALIGNED( type, var, n ) __declspec(align(n)) type var
-#              define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
-#   else
-#       define DECLARE_ALIGNED( type, var, n ) type var __attribute__((aligned(n)))
-#   endif
-#endif
-
 #endif