OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5c901a
)
progs: Prevent clash with min macro.
author
José Fonseca
<jfonseca@vmware.com>
Thu, 12 Feb 2009 13:54:20 +0000
(13:54 +0000)
committer
José Fonseca
<jfonseca@vmware.com>
Thu, 12 Feb 2009 13:54:55 +0000
(13:54 +0000)
progs/demos/streaming_rect.c
patch
|
blob
|
history
diff --git
a/progs/demos/streaming_rect.c
b/progs/demos/streaming_rect.c
index
4d4656e
..
294f9c3
100644
(file)
--- 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()
{