Mesa (master): progs: Prevent clash with min macro.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Feb 12 13:54:59 UTC 2009
Module: Mesa
Branch: master
Commit: 7ef8e4e181d0c410c32d8939f3207e8adfb4e6e0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ef8e4e181d0c410c32d8939f3207e8adfb4e6e0
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Feb 12 13:54:20 2009 +0000
progs: Prevent clash with min macro.
---
progs/demos/streaming_rect.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/progs/demos/streaming_rect.c b/progs/demos/streaming_rect.c
index 4d4656e..294f9c3 100644
--- a/progs/demos/streaming_rect.c
+++ b/progs/demos/streaming_rect.c
@@ -47,7 +47,10 @@ static void Idle( void )
}
/*static int max( int a, int b ) { return a > b ? a : b; }*/
+
+#ifndef min
static int min( int a, int b ) { return a < b ? a : b; }
+#endif
static void DrawObject()
{
More information about the mesa-commit
mailing list