From: José Fonseca <jfonseca@vmware.com>
Date: Thu, 12 Feb 2009 13:54:20 +0000 (+0000)
Subject: progs: Prevent clash with min macro.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7ef8e4e181d0c410c32d8939f3207e8adfb4e6e0;p=mesa.git

progs: Prevent clash with min macro.
---

diff --git a/progs/demos/streaming_rect.c b/progs/demos/streaming_rect.c
index 4d4656e722b..294f9c30607 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()
 {