From: Loren Merritt <pengvado@videolan.org>
Date: Fri, 30 Mar 2007 20:20:36 +0000 (+0000)
Subject: remove private stuff from public headers. no more need for -D__X264__
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd7e21c6cba26298eac190abcb702b490bd98c5e;p=libx264

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 2bd0552b..dd055f5e 100644
--- 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 b7152be5..b6e0d9e8 100755
--- 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 cbddbee7..630446dc 100644
--- 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