Commit: cf8a19667263ff7325b94e6dd559c79b78c65121
Author: Jason Wilkins
Date: Fri Aug 1 10:22:02 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rBcf8a19667263ff7325b94e6dd559c79b78c65121
GLEW_CHK doesn't need to be extern
===================================================================
M intern/glew-mx/glew-mx.h
M intern/glew-mx/intern/glew-mx.c
===================================================================
diff --git a/intern/glew-mx/glew-mx.h b/intern/glew-mx/glew-mx.h
index 0825133..4a91997 100644
--- a/intern/glew-mx/glew-mx.h
+++ b/intern/glew-mx/glew-mx.h
@@ -96,15 +96,6 @@ void mxMakeCurrentContext(MXContext *ctx);
void mxDestroyContext (MXContext *ctx);
-GLenum glew_chk(GLenum error, const char *file, int line, const char *text);
-
-#ifndef NDEBUG
-# define GLEW_CHK(x) glew_chk((x), __FILE__, __LINE__, #x)
-#else
-# define GLEW_CHK(x) glew_chk((x), NULL, 0, NULL)
-#endif
-
-
#ifdef __cplusplus
}
#endif
diff --git a/intern/glew-mx/intern/glew-mx.c b/intern/glew-mx/intern/glew-mx.c
index 54b9063..e5df6fd 100644
--- a/intern/glew-mx/intern/glew-mx.c
+++ b/intern/glew-mx/intern/glew-mx.c
@@ -56,7 +56,7 @@ static const char *get_glew_error_enum_string(GLenum error)
}
-GLenum glew_chk(GLenum error, const char *file, int line, const char *text)
+static GLenum glew_chk(GLenum error, const char *file, int line, const char
*text)
{
if (error != GLEW_OK) {
const char *code = get_glew_error_enum_string(error);
@@ -80,7 +80,6 @@ GLenum glew_chk(GLenum error, const char *file, int line,
const char *text)
return error;
}
-
#ifndef NDEBUG
# define GLEW_CHK(x) glew_chk((x), __FILE__, __LINE__, #x)
#else
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
