Commit: 2871bad8ea92646d3c10001e9f113a145d9a89b4
Author: Dalai Felinto
Date: Wed Apr 12 18:58:38 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB2871bad8ea92646d3c10001e9f113a145d9a89b4
Fix T51188 compilation errors in Windows
===================================================================
M source/blender/gpu/GPU_legacy_stubs.h
===================================================================
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
