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

[mru]

Author: mru
Date: Fri Jul 14 02:25:58 2006
New Revision: 5738

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:25:58 2006
@@ -172,14 +172,14 @@
 #    endif
 #endif
 
-#ifdef __MINGW32__
-
-/* windows */
+#ifndef int64_t_C
+#define int64_t_C(c)     (c ## LL)
+#define uint64_t_C(c)    (c ## ULL)
+#endif
 
-#    define int64_t_C(c)     (c ## LL)
-#    define uint64_t_C(c)    (c ## ULL)
+#ifdef HAVE_AV_CONFIG_H
 
-#    ifdef HAVE_AV_CONFIG_H
+#ifdef __MINGW32__
 #        ifdef _DEBUG
 #            define DEBUG
 #        endif
@@ -191,25 +191,14 @@
 #            define perror(a)
 #        endif
 
-#    endif
-
 /* __MINGW32__ end */
 #elif defined (CONFIG_OS2)
 /* OS/2 EMX */
 
-#ifdef HAVE_AV_CONFIG_H
-
 #include <float.h>
 
-#endif /* HAVE_AV_CONFIG_H */
 #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
 #        include "fastmemcpy.h"
 #    endif