| commit | 7ef8e4e181d0c410c32d8939f3207e8adfb4e6e0 | [log] [tgz] |
|---|---|---|
| author | José Fonseca <jfonseca@vmware.com> | Thu Feb 12 13:54:20 2009 +0000 |
| committer | José Fonseca <jfonseca@vmware.com> | Thu Feb 12 13:54:55 2009 +0000 |
| tree | eb16bade95503190e7011c6e03546d0e01f32b85 | |
| parent | b5c901a73060d0b18746d83fc8977e8bbe7ee784 [diff] [blame] |
progs: Prevent clash with min macro.
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 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() {