diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-07-05 00:53:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-07-05 00:53:13 +1000 |
| commit | 77f8167d75d0016c76812fc147c06072e5729965 (patch) | |
| tree | f610929b3fa6d62013593df797b9e05d7c1452b4 /include | |
| parent | 6f56b527d866506a323feb19f9d8529d40034af2 (diff) | |
| parent | 194cfc7a4ed86653db34be0e331ad7c23b5334eb (diff) | |
Merge remote branch 'upstream/gallium-0.1' into gallium-0.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/GLES/glplatform.h | 1 | ||||
| -rw-r--r-- | include/GLES2/gl2platform.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h index 5ce0cbe84a..543464ba6f 100644 --- a/include/GLES/glplatform.h +++ b/include/GLES/glplatform.h @@ -51,7 +51,6 @@ extern "C" { # else # define GL_API __declspec(dllimport) # endif -# define GLAPIENTRY __stdcall #else # ifdef __GL_EXPORTS # define GL_API diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h index 077571e4ea..7c3a22e43e 100644 --- a/include/GLES2/gl2platform.h +++ b/include/GLES2/gl2platform.h @@ -51,7 +51,6 @@ extern "C" { # else # define GL_APICALL __declspec(dllimport) # endif -# define GLAPIENTRY __stdcall #else # ifdef __GL_EXPORTS # define GL_APICALL |