From 0339e2b49f8a87937a1b7ad23ec8158e8ef3fe34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Fri, 14 Jul 2006 00:25:58 +0000
Subject: [PATCH] simplify

Originally committed as revision 5738 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavutil/common.h | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/libavutil/common.h b/libavutil/common.h
index 22a2c0690c..9558288bbb 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -172,14 +172,14 @@ typedef uint64_t      uint_fast64_t;
 #    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 @@ typedef uint64_t      uint_fast64_t;
 #            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