[Ffmpeg-cvslog] r5737 - trunk/libavutil/common.h

[mru]

Author: mru
Date: Fri Jul 14 02:20:04 2006
New Revision: 5737

Modified:
   trunk/libavutil/common.h

Log:
simplify


Modified: trunk/libavutil/common.h
==============================================================================
--- trunk/libavutil/common.h	(original)
+++ trunk/libavutil/common.h	Fri Jul 14 02:20:04 2006
@@ -197,25 +197,12 @@
 #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 @@
 #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)