[Bf-blender-cvs] [47b8bf5] master: Fix more issues after recent context commit
Sergey Sharybin
noreply at git.blender.org
Wed Oct 8 00:16:32 CEST 2014
Commit: 47b8bf591cda04701cf8d7e1e576a40fc98884b0
Author: Sergey Sharybin
Date: Wed Oct 8 04:15:51 2014 +0600
Branches: master
https://developer.blender.org/rB47b8bf591cda04701cf8d7e1e576a40fc98884b0
Fix more issues after recent context commit
===================================================================
M intern/glew-mx/intern/glew-mx.c
===================================================================
diff --git a/intern/glew-mx/intern/glew-mx.c b/intern/glew-mx/intern/glew-mx.c
index 35f2be2..8b0ab42 100644
--- a/intern/glew-mx/intern/glew-mx.c
+++ b/intern/glew-mx/intern/glew-mx.c
@@ -69,6 +69,9 @@ GLenum glew_chk(GLenum error, const char *file, int line, const char *text)
code ? code : "<no symbol>",
msg ? msg : "<no message>");
#else
+ (void) file;
+ (void) line;
+ (void) text;
fprintf(stderr,
"GLEW Error (0x%04X): %s: %s\n",
error,
@@ -88,7 +91,7 @@ MXContext *_mx_context = NULL;
MXContext *mxCreateContext(void)
{
-#if WITH_GLEW_MX
+#ifdef WITH_GLEW_MX
MXContext* new_ctx = calloc(1, sizeof(MXContext));
if (new_ctx != NULL) {
@@ -108,7 +111,7 @@ MXContext *mxCreateContext(void)
MXContext *mxGetCurrentContext(void)
{
-#if WITH_GLEW_MX
+#ifdef WITH_GLEW_MX
return _mx_context;
#else
return NULL;
@@ -118,7 +121,7 @@ MXContext *mxGetCurrentContext(void)
void mxMakeCurrentContext(MXContext *ctx)
{
-#if WITH_GLEW_MX
+#ifdef WITH_GLEW_MX
_mx_context = ctx;
#else
(void)ctx;
@@ -128,7 +131,7 @@ void mxMakeCurrentContext(MXContext *ctx)
void mxDestroyContext(MXContext *ctx)
{
-#if WITH_GLEW_MX
+#ifdef WITH_GLEW_MX
if (_mx_context == ctx)
_mx_context = NULL;
More information about the Bf-blender-cvs
mailing list