diff options
| author | José Fonseca <jfonseca@vmware.com> | 2014-04-29 14:33:41 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2014-04-30 10:41:55 +0100 |
| commit | 210cbffaeb47ac1b3bca1c758d5ff62f1e0b1a5c (patch) | |
| tree | e50514f603d536ed750946c5dfb24069234e861f /tests/util/piglit-dispatch.h | |
| parent | 25dcb8506b24988f6ae943a7f08c91fdb8cbc52e (diff) | |
piglit-dispatch: Prevent re-definition of APIENTRY.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'tests/util/piglit-dispatch.h')
| -rw-r--r-- | tests/util/piglit-dispatch.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/util/piglit-dispatch.h b/tests/util/piglit-dispatch.h index 669aeccfb..c24c18621 100644 --- a/tests/util/piglit-dispatch.h +++ b/tests/util/piglit-dispatch.h @@ -56,21 +56,15 @@ #include <stdint.h> #include <stddef.h> -#ifdef __cplusplus -extern "C" { -#endif - #ifndef _WIN32 /* APIENTRY and GLAPIENTRY are not used on Linux or Mac. */ #define APIENTRY #define GLAPIENTRY -#else +#else /* _WIN32 */ -#ifndef APIENTRY -#define APIENTRY __stdcall -#endif +#include <windows.h> // APIENTRY #ifndef GLAPIENTRY #define GLAPIENTRY APIENTRY @@ -80,6 +74,10 @@ extern "C" { #define GLAPI extern #endif +#endif /* _WIN32 */ + +#ifdef __cplusplus +extern "C" { #endif typedef unsigned int GLenum; |