diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-12 19:58:38 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-12 19:58:38 +0300 |
| commit | 2871bad8ea92646d3c10001e9f113a145d9a89b4 (patch) | |
| tree | bca57cf94e8aaa4a20684c614351bfe017225241 /source/blender/gpu/GPU_legacy_stubs.h | |
| parent | 6e4cc26265ef260a8c6891a8f6b13eacaaf6e91e (diff) | |
Fix T51188 compilation errors in Windows
Diffstat (limited to 'source/blender/gpu/GPU_legacy_stubs.h')
| -rw-r--r-- | source/blender/gpu/GPU_legacy_stubs.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/gpu/GPU_legacy_stubs.h b/source/blender/gpu/GPU_legacy_stubs.h index 6201b182896..3564192651e 100644 --- a/source/blender/gpu/GPU_legacy_stubs.h +++ b/source/blender/gpu/GPU_legacy_stubs.h @@ -47,8 +47,6 @@ #include "BLI_utildefines.h" -#define _GL_PREFIX static inline - /** * Empty function, use for breakpoint when a depreacated * OpenGL function is called. @@ -58,32 +56,32 @@ static void gl_deprecated(void) BLI_assert(true); } -#define _GL_BOOL _GL_PREFIX GLboolean +#define _GL_BOOL BLI_INLINE GLboolean #define _GL_BOOL_RET { \ gl_deprecated(); \ return false; \ } -#define _GL_ENUM _GL_PREFIX GLenum +#define _GL_ENUM BLI_INLINE GLenum #define _GL_ENUM_RET { \ gl_deprecated(); \ return 0; \ } -#define _GL_INT _GL_PREFIX GLint +#define _GL_INT BLI_INLINE GLint #define _GL_INT_RET { \ gl_deprecated(); \ return 0; \ } -#define _GL_UINT _GL_PREFIX GLuint +#define _GL_UINT BLI_INLINE GLuint #define _GL_UINT_RET { \ gl_deprecated(); \ return 0; \ } -#define _GL_VOID _GL_PREFIX void +#define _GL_VOID BLI_INLINE void #define _GL_VOID_RET { \ gl_deprecated(); \ } @@ -462,7 +460,6 @@ _GL_VOID DO_NOT_USE_glVertexPointer (GLint size, GLenum type, GLsizei stride, co #undef _GL_UINT_RET #undef _GL_VOID #undef _GL_VOID_RET -#undef _GL_PREFIX #if defined(__GNUC__) # pragma GCC diagnostic pop |