From 42f53bf3d5d3ec823e4db53fde5f0efd1bbc3451 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 9 Jul 2008 16:19:01 +0200 Subject: Fix MIN, MAX macro replacement (mingw32 fix) xine was already checking for MIN/MAX macros but the replacement does not work (at least not on mingw32). This change defines HAVE_[MIN|MAX]_MACRO and if missing, providedes them in lib/os_internal.h --- lib/os_internal.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/os_internal.h') diff --git a/lib/os_internal.h b/lib/os_internal.h index 968b8f02f..fe406a747 100644 --- a/lib/os_internal.h +++ b/lib/os_internal.h @@ -36,6 +36,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 -- cgit v1.2.3