summaryrefslogtreecommitdiff
path: root/src/xine-engine/osd.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine/osd.c')
-rw-r--r--src/xine-engine/osd.c26
1 files changed, 7 insertions, 19 deletions
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index aaad50a63..96b550275 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -40,26 +40,14 @@
#define LOG_DEBUG 1
*/
-#ifdef DEBUG
-
-# ifdef __GNUC__
-# define LOG(lvl, fmt...) fprintf (stderr, fmt);
-# else
-# define LOG(lvl, ...) fprintf (stderr, __VA_ARGS__);
-# endif
-
-#else /* !DEBUG */
-
-# ifdef __GNUC__
-# define LOG(lvl, fmt...)
-# else
-# define LOG(lvl, ...)
-# endif
-
-#endif /* !DEBUG */
-
-
+#ifdef MAX
+#undef MAX
+#endif
#define MAX(a,b) ( (a) > (b) ) ? (a) : (b)
+
+#ifdef MIN
+#undef MIN
+#endif
#define MIN(a,b) ( (a) < (b) ) ? (a) : (b)
/*