diff options
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/demux.c | 5 | ||||
| -rw-r--r-- | src/xine-engine/osd.c | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index c116d407f..257a72383 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -47,11 +47,6 @@ #include <winsock.h> #endif -#ifdef MIN -#undef MIN -#endif -#define MIN(a,b) ( (a) < (b) ) ? (a) : (b) - /* * Flush audio and video buffers. It is called from demuxers on * seek/stop, and may be useful when user input changes a stream and diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 7c74c50bc..36ce47e44 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -83,17 +83,6 @@ # define UCS2_ENCODING "UCS-2LE" #endif -#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) - - #if (FREETYPE_MAJOR > 2) || \ (FREETYPE_MAJOR == 2 && FREETYPE_MINOR > 1) || \ (FREETYPE_MAJOR == 2 && FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 3) |