# HG changeset patch # User alex # Date 1090124618 0 # Node ID 5c83c247bad11d99ec732d8311a2207bbea63abc # Parent d466d97bfe8da189ba0ce0d9faf2947ba4283f35 no redefinition, clashes with OpenBSD diff -r d466d97bfe8d -r 5c83c247bad1 libmpdemux/realrtsp/real.c --- a/libmpdemux/realrtsp/real.c Sat Jul 17 14:44:06 2004 +0000 +++ b/libmpdemux/realrtsp/real.c Sun Jul 18 04:23:38 2004 +0000 @@ -55,7 +55,9 @@ #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) {