[pulseaudio-commits] r1829 - /branches/lennart/src/pulsecore/macro.h

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Sun Sep 16 23:54:12 2007
New Revision: 1829

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1829&root=pulseaudio&view=rev
Log:
properly define MAX/MIN macros

Modified:
    branches/lennart/src/pulsecore/macro.h

Modified: branches/lennart/src/pulsecore/macro.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/macro.h?rev=1829&root=pulseaudio&r1=1828&r2=1829&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/macro.h (original)
+++ branches/lennart/src/pulsecore/macro.h Sun Sep 16 23:54:12 2007
@@ -64,8 +64,13 @@
 
 #define PA_ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
 
-#define SA_MAX(a, b) ((a) > (b) ? (a) : (b))
-#define SA_MIN(a, b) ((a) < (b) ? (a) : (b))
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
 
 #ifdef __GNUC__
 #define PA_PRETTY_FUNCTION __PRETTY_FUNCTION__