Commit dd7e21c6 authored by Loren Merritt's avatar Loren Merritt

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
parent 87fdea89
......@@ -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>
......
......@@ -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
......
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment