Commit 0339e2b4 authored by Måns Rullgård's avatar Måns Rullgård

simplify

Originally committed as revision 5738 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6d3d62b3
...@@ -172,14 +172,14 @@ typedef uint64_t uint_fast64_t; ...@@ -172,14 +172,14 @@ typedef uint64_t uint_fast64_t;
# endif # endif
#endif #endif
#ifdef __MINGW32__ #ifndef int64_t_C
#define int64_t_C(c) (c ## LL)
/* windows */ #define uint64_t_C(c) (c ## ULL)
#endif
# define int64_t_C(c) (c ## LL) #ifdef HAVE_AV_CONFIG_H
# define uint64_t_C(c) (c ## ULL)
# 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; ...@@ -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
......
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