Mercurial > libavutil.hg

changeset 73:9718c0d015cc libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify
author mru
date Fri, 14 Jul 2006 00:20:04 +0000
parents 6bddc9b2c9de
children a298a8eae4f2
files common.h
diffstat 1 files changed, 4 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/common.h	Fri Jul 14 00:04:40 2006 +0000
+++ b/common.h	Fri Jul 14 00:20:04 2006 +0000
@@ -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)