Originally committed as revision 5738 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-07-14 00:25:58 +00:00
parent 6d3d62b3d3
commit 0339e2b49f

View File

@ -172,14 +172,14 @@ typedef uint64_t uint_fast64_t;
# endif # endif
#endif #endif
#ifdef __MINGW32__ #ifndef int64_t_C
/* windows */
#define int64_t_C(c) (c ## LL) #define int64_t_C(c) (c ## LL)
#define uint64_t_C(c) (c ## ULL) #define uint64_t_C(c) (c ## ULL)
#endif
#ifdef HAVE_AV_CONFIG_H #ifdef HAVE_AV_CONFIG_H
#ifdef __MINGW32__
# ifdef _DEBUG # ifdef _DEBUG
# define DEBUG # define DEBUG
# endif # endif
@ -191,25 +191,14 @@ typedef uint64_t uint_fast64_t;
# define perror(a) # define perror(a)
# endif # endif
# endif
/* __MINGW32__ end */ /* __MINGW32__ end */
#elif defined (CONFIG_OS2) #elif defined (CONFIG_OS2)
/* OS/2 EMX */ /* OS/2 EMX */
#ifdef HAVE_AV_CONFIG_H
#include <float.h> #include <float.h>
#endif /* HAVE_AV_CONFIG_H */
#endif /* !__MINGW32__ && CONFIG_OS2 */ #endif /* !__MINGW32__ && CONFIG_OS2 */
#ifndef int64_t_C
#define int64_t_C(c) (c ## LL)
#define uint64_t_C(c) (c ## ULL)
#endif
#ifdef HAVE_AV_CONFIG_H
# ifdef USE_FASTMEMCPY # ifdef USE_FASTMEMCPY
# include "fastmemcpy.h" # include "fastmemcpy.h"
# endif # endif