summaryrefslogtreecommitdiffstats
path: root/progs/demos
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-02-12 13:54:20 +0000
committerJosé Fonseca <jfonseca@vmware.com>2009-02-12 13:54:55 +0000
commit7ef8e4e181d0c410c32d8939f3207e8adfb4e6e0 (patch)
treeeb16bade95503190e7011c6e03546d0e01f32b85 /progs/demos
parentb5c901a73060d0b18746d83fc8977e8bbe7ee784 (diff)
progs: Prevent clash with min macro.
Diffstat (limited to 'progs/demos')
-rw-r--r--progs/demos/streaming_rect.c3
1 files changed, 3 insertions, 0 deletions
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()
{