aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-26 13:17:50 +0000
committerGravatar uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-26 13:17:50 +0000
commita5ddf3c5316c89ec6757bdc271abec150c02c980 (patch)
tree48451aa6a86203b619c6a6071a8c44482ad86893
parent7142e36d1f4ed5a45e089bb972db73bb3f91ad94 (diff)
Revert r21251 (moving loader/config.h contents to main config.h).
There are #ifdef TRACE tests in libav* and defining TRACE in toplevel config.h breaks things. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21265 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure10
-rw-r--r--loader/config.h9
2 files changed, 9 insertions, 10 deletions
diff --git a/configure b/configure
index 7a175116da..ceaf6c6d2c 100755
--- a/configure
+++ b/configure
@@ -7792,16 +7792,6 @@ $_def_macosx_corevideo
/* Build our Win32-loader */
$_def_win32_loader
-/* some definitions for the loader */
-#ifdef DEBUG
-#define TRACE printf
-#define dbg_printf printf
-#else
-#define TRACE(...)
-#define dbg_printf(...)
-#endif
-
-
/* ffmpeg's libavcodec support (requires libavcodec source) */
$_def_libavcodec
$_def_libavcodec_so
diff --git a/loader/config.h b/loader/config.h
new file mode 100644
index 0000000000..eb67816102
--- /dev/null
+++ b/loader/config.h
@@ -0,0 +1,9 @@
+#include "../config.h"
+
+#ifdef DEBUG
+#define TRACE printf
+#define dbg_printf printf
+#else
+#define TRACE(...)
+#define dbg_printf(...)
+#endif