From 7de9985f13eb453c2cbf77e67d0db9a2a65e142e Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 18 Jul 2004 04:23:38 +0000 Subject: [PATCH] no redefinition, clashes with OpenBSD git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12846 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/realrtsp/real.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libmpdemux/realrtsp/real.c b/libmpdemux/realrtsp/real.c index 0e88f7442b..7e023ba961 100644 --- a/libmpdemux/realrtsp/real.c +++ b/libmpdemux/realrtsp/real.c @@ -55,7 +55,9 @@ const unsigned char xor_table[] = { #define BE_32(x) be2me_32(*(uint32_t*)(x)) +#ifndef MAX #define MAX(x,y) ((x>y) ? x : y) +#endif #ifdef LOG static void hexdump (const char *buf, int length) {