diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-10-11 08:19:39 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-10-11 08:19:39 +0000 |
| commit | 49e17f8407f88422fba83e3e31ba55cf9534f7ba (patch) | |
| tree | 6a9a28a79415530b2ecafe58dbb2f46250f09cf4 | |
| parent | 75917b887b4b7b672c613b0db6cedc92844706fe (diff) | |
| download | ffmpeg-49e17f8407f88422fba83e3e31ba55cf9534f7ba.tar.gz | |
recommit of
#define DEBUG fix by (Glenn Maynard <g_sf at zewt dot org>)
Originally committed as revision 2352 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/common.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h index c1b1d47485..5cd4231774 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -99,19 +99,23 @@ typedef signed __int64 int64_t; # define int64_t_C(c) (c ## i64) # define uint64_t_C(c) (c ## i64) -# define inline __inline +# ifdef HAVE_AV_CONFIG_H +# define inline __inline +# endif # else # define int64_t_C(c) (c ## LL) # define uint64_t_C(c) (c ## ULL) # endif /* __MINGW32__ */ -# ifdef _DEBUG -# define DEBUG -# endif +# ifdef HAVE_AV_CONFIG_H +# ifdef _DEBUG +# define DEBUG +# endif -# define snprintf _snprintf -# define vsnprintf _vsnprintf +# define snprintf _snprintf +# define vsnprintf _vsnprintf +# endif /* CONFIG_WIN32 end */ #elif defined (CONFIG_OS2) |