diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-17 16:50:59 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-17 16:50:59 +0100 |
| commit | 35b16971490c92f53cb5264e68ba67fb7352629a (patch) | |
| tree | 5a17a0bc2f6abfae1d802e094c07b5b72aaa6d00 /lib | |
| parent | b70e34352e304cf03da32b688d84eec3c3ffacec (diff) | |
| parent | f1382ea01b368dc1d8044b368f602aad87f6468e (diff) | |
| download | xine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.gz xine-lib-35b16971490c92f53cb5264e68ba67fb7352629a.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/os_internal.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/os_internal.h b/lib/os_internal.h index eaf56adc3..8136ce76e 100644 --- a/lib/os_internal.h +++ b/lib/os_internal.h @@ -100,6 +100,13 @@ # define XINE_DIRECTORY_SEPARATOR_CHAR '/' #endif +/* replacement of min/max macros */ +#ifndef HAVE_MAX_MACRO +#define MAX(a,b) (((a)>(b))?(a):(b)) +#endif +#ifndef HAVE_MIN_MACRO +#define MIN(a,b) (((a)<(b))?(a):(b)) +#endif /* replacement of strndup */ #ifndef HAVE_STRNDUP |