aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-05-26 15:07:57 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-05-26 15:07:57 +0000
commit6a3d7e36c9c16088d6965500fd1d6fb0360c8faf (patch)
tree5676dc1ad8d454415e9cb498aa983b6cb02d8237
parentfad9f495c07be2d990620f5000de075ba2cf1cbd (diff)
downloadffmpeg-6a3d7e36c9c16088d6965500fd1d6fb0360c8faf.tar.gz
fixed mangle issue
Originally committed as revision 605 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/common.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h
index c1b8c657c4..02a7c10492 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -73,12 +73,6 @@ typedef INT64 int64_t;
#define snprintf _snprintf
-#ifdef HAVE_AV_CONFIG_H
-
-#define MANGLE(a) "_" #a
-
-#endif /* HAVE_AV_CONFIG_H */
-
#else /* CONFIG_WIN32 */
/* unix */
@@ -113,8 +107,6 @@ typedef signed long long INT64;
#include "fastmemcpy.h"
#endif
-#define MANGLE(a) #a
-
#endif /* HAVE_AV_CONFIG_H */
#endif /* !CONFIG_WIN32 */
@@ -124,6 +116,13 @@ typedef signed long long INT64;
#include "bswap.h"
+#if defined(__MINGW32__) || defined(__CYGWIN__) || \
+ defined(__OS2__) || defined (__OpenBSD__)
+#define MANGLE(a) "_" #a
+#else
+#define MANGLE(a) #a
+#endif
+
/* debug stuff */
#ifndef DEBUG