diff options
| author | Vinson Lee <[email protected]> | 2012-09-04 22:53:42 -0700 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2012-09-05 22:14:32 -0700 |
| commit | 17a574d7cd8c541c902cc0da40362a32d965e77b (patch) | |
| tree | 749c3734460efa898e72f17dd85b7065e6104de5 /src/gallium/tests | |
| parent | df5eb0c9bc951a8f69ebaa70e6cccdb9e8b27c04 (diff) | |
Use the correct macro _WIN32 for Windows.
The correct predefined macro for Windows is _WIN32, not WIN32 or
__WIN32__. _WIN32 is defined for 32-bit and 64-bit version of Windows
by both MSVC and MinGW compilers.
http://sourceforge.net/p/predef/wiki/OperatingSystems
http://msdn.microsoft.com/en-us/library/b0084kay.aspx
This patch also fixes a MinGW automake build error.
Signed-off-by: Vinson Lee <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/tests')
| -rw-r--r-- | src/gallium/tests/graw/fs-test.c | 2 | ||||
| -rw-r--r-- | src/gallium/tests/graw/gs-test.c | 2 | ||||
| -rw-r--r-- | src/gallium/tests/graw/vs-test.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c index 1c0d514667a..ffb6bd269d6 100644 --- a/src/gallium/tests/graw/fs-test.c +++ b/src/gallium/tests/graw/fs-test.c @@ -22,7 +22,7 @@ unsigned show_fps = 0; static void usage(char *name) { fprintf(stderr, "usage: %s [ options ] shader_filename\n", name); -#ifndef WIN32 +#ifndef _WIN32 fprintf(stderr, "\n" ); fprintf(stderr, "options:\n"); fprintf(stderr, " -fps show frames per second\n"); diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c index 52eb6007976..48db759a112 100644 --- a/src/gallium/tests/graw/gs-test.c +++ b/src/gallium/tests/graw/gs-test.c @@ -23,7 +23,7 @@ unsigned draw_strip = 0; static void usage(char *name) { fprintf(stderr, "usage: %s [ options ] shader_filename\n", name); -#ifndef WIN32 +#ifndef _WIN32 fprintf(stderr, "\n" ); fprintf(stderr, "options:\n"); fprintf(stderr, " -fps show frames per second\n"); diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c index ad524c46537..d01cdf8e95f 100644 --- a/src/gallium/tests/graw/vs-test.c +++ b/src/gallium/tests/graw/vs-test.c @@ -23,7 +23,7 @@ unsigned show_fps = 0; static void usage(char *name) { fprintf(stderr, "usage: %s [ options ] shader_filename\n", name); -#ifndef WIN32 +#ifndef _WIN32 fprintf(stderr, "\n" ); fprintf(stderr, "options:\n"); fprintf(stderr, " -fps show frames per second\n"); |