diff options
| author | Yaron Cohen-Tal <yaronct@gmail.com> | 2015-07-19 12:59:31 +0300 |
|---|---|---|
| committer | Yaron Cohen-Tal <yaronct@gmail.com> | 2015-07-19 13:40:35 +0300 |
| commit | 90c6158d61a4b27f00997049d67344b425275c5c (patch) | |
| tree | 65366dd2d858c408b4087cca9470f1551d671240 /include/epoxy/gl.h | |
| parent | 773dd02f596b3f256bb1c0f65ac091db93a9518b (diff) | |
| download | libepoxy-90c6158d61a4b27f00997049d67344b425275c5c.tar.gz | |
Unite defenitions "PUBLIC" and "EPOXY_IMPORTEXPORT" and add it where appropriate. Fix tests build errors.
Diffstat (limited to 'include/epoxy/gl.h')
| -rw-r--r-- | include/epoxy/gl.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/epoxy/gl.h b/include/epoxy/gl.h index 0be3a66..d150da4 100644 --- a/include/epoxy/gl.h +++ b/include/epoxy/gl.h @@ -30,12 +30,13 @@ #ifndef EPOXY_GL_H #define EPOXY_GL_H +#include <epoxy/common.h> +#include <stdbool.h> + #ifdef __cplusplus extern "C" { #endif -#include <stdbool.h> - #if defined(__gl_h_) || defined(__glext_h_) #error epoxy/gl.h must be included before (or in place of) GL/gl.h #else @@ -51,7 +52,6 @@ extern "C" { /* APIENTRY and GLAPIENTRY are not used on Linux or Mac. */ #define APIENTRY #define GLAPIENTRY -#define EPOXY_IMPORTEXPORT #define EPOXY_CALLSPEC #define GLAPI #define KHRONOS_APIENTRY @@ -70,10 +70,6 @@ extern "C" { #define EPOXY_CALLSPEC __stdcall #endif -#ifndef EPOXY_IMPORTEXPORT -#define EPOXY_IMPORTEXPORT __declspec(dllimport) -#endif - #ifndef GLAPI #define GLAPI extern #endif |