diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-07-14 00:20:04 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-07-14 00:20:04 +0000 |
| commit | 6d3d62b3d356d81813b26c4bdf9c09e97b282a9c (patch) | |
| tree | 1d9057af357493e1e1e442f1bdf6ba998e389107 /libavutil | |
| parent | 1dd590619ade0cf7894e01393ffbc6b79d39373c (diff) | |
| download | ffmpeg-6d3d62b3d356d81813b26c4bdf9c09e97b282a9c.tar.gz | |
simplify
Originally committed as revision 5737 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/common.h | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 3e92e298ad..22a2c0690c 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -197,25 +197,12 @@ typedef uint64_t uint_fast64_t; #elif defined (CONFIG_OS2) /* OS/2 EMX */ -#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 -#include "fastmemcpy.h" -#endif - #include <float.h> #endif /* HAVE_AV_CONFIG_H */ - -/* CONFIG_OS2 end */ -#else - -/* unix */ +#endif /* !__MINGW32__ && CONFIG_OS2 */ #ifndef int64_t_C #define int64_t_C(c) (c ## LL) @@ -223,15 +210,9 @@ typedef uint64_t uint_fast64_t; #endif #ifdef HAVE_AV_CONFIG_H - -# ifdef USE_FASTMEMCPY -# include "fastmemcpy.h" -# endif -# endif /* HAVE_AV_CONFIG_H */ - -#endif /* !__MINGW32__ && !CONFIG_OS2 */ - -#ifdef HAVE_AV_CONFIG_H +# ifdef USE_FASTMEMCPY +# include "fastmemcpy.h" +# endif #if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV) # define FF_IMPORT_ATTR __declspec(dllimport) |