[Bf-blender-cvs] [21a9921] soc-2014-viewport_context: Remove `_` from _CASE_CODE_RETURN_STR, keep that for internal defines

[Campbell Barton]

Commit: 21a992150ac6a8c639be9b42e29adbc6bbcef725
Author: Campbell Barton
Date:   Thu Jul 24 22:58:34 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rB21a992150ac6a8c639be9b42e29adbc6bbcef725

Remove `_` from _CASE_CODE_RETURN_STR, keep that for internal defines

===================================================================

M	intern/ghost/intern/GHOST_Context.cpp
M	intern/ghost/intern/GHOST_Context.h
M	intern/ghost/intern/GHOST_ContextEGL.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_Context.cpp b/intern/ghost/intern/GHOST_Context.cpp
index 5cfaadf..38f26c3 100644
--- a/intern/ghost/intern/GHOST_Context.cpp
+++ b/intern/ghost/intern/GHOST_Context.cpp
@@ -79,15 +79,15 @@ static const char *get_glew_error_message_string(GLenum error)
 static const char *get_glew_error_enum_string(GLenum error)
 {
 	switch (error) {
-		_CASE_CODE_RETURN_STR(GLEW_OK) /* also GLEW_NO_ERROR */
-		_CASE_CODE_RETURN_STR(GLEW_ERROR_NO_GL_VERSION)
-		_CASE_CODE_RETURN_STR(GLEW_ERROR_GL_VERSION_10_ONLY)
-		_CASE_CODE_RETURN_STR(GLEW_ERROR_GLX_VERSION_11_ONLY)
+		CASE_CODE_RETURN_STR(GLEW_OK) /* also GLEW_NO_ERROR */
+		CASE_CODE_RETURN_STR(GLEW_ERROR_NO_GL_VERSION)
+		CASE_CODE_RETURN_STR(GLEW_ERROR_GL_VERSION_10_ONLY)
+		CASE_CODE_RETURN_STR(GLEW_ERROR_GLX_VERSION_11_ONLY)
 #ifdef WITH_GLEW_ES
-		_CASE_CODE_RETURN_STR(GLEW_ERROR_NOT_GLES_VERSION)
-		_CASE_CODE_RETURN_STR(GLEW_ERROR_GLES_VERSION)
-		_CASE_CODE_RETURN_STR(GLEW_ERROR_NO_EGL_VERSION)
-		_CASE_CODE_RETURN_STR(GLEW_ERROR_EGL_VERSION_10_ONLY)
+		CASE_CODE_RETURN_STR(GLEW_ERROR_NOT_GLES_VERSION)
+		CASE_CODE_RETURN_STR(GLEW_ERROR_GLES_VERSION)
+		CASE_CODE_RETURN_STR(GLEW_ERROR_NO_EGL_VERSION)
+		CASE_CODE_RETURN_STR(GLEW_ERROR_EGL_VERSION_10_ONLY)
 #endif
 		default:
 			return NULL;
diff --git a/intern/ghost/intern/GHOST_Context.h b/intern/ghost/intern/GHOST_Context.h
index d845796..8dabad9 100644
--- a/intern/ghost/intern/GHOST_Context.h
+++ b/intern/ghost/intern/GHOST_Context.h
@@ -165,6 +165,6 @@ bool win32_chk(bool result, const char *file = NULL, int line = 0, const char *t
 #  endif
 #endif  /* _WIN32 */
 
-#define _CASE_CODE_RETURN_STR(code) case code: return #code;
+#define CASE_CODE_RETURN_STR(code) case code: return #code;
 
 #endif // __GHOST_CONTEXT_H__
diff --git a/intern/ghost/intern/GHOST_ContextEGL.cpp b/intern/ghost/intern/GHOST_ContextEGL.cpp
index d935816..d24ca1a 100644
--- a/intern/ghost/intern/GHOST_ContextEGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextEGL.cpp
@@ -46,21 +46,21 @@ EGLEWContext *eglewContext = NULL;
 static const char *get_egl_error_enum_string(EGLenum error)
 {
 	switch (error) {
-		_CASE_CODE_RETURN_STR(EGL_SUCCESS)
-		_CASE_CODE_RETURN_STR(EGL_NOT_INITIALIZED)
-		_CASE_CODE_RETURN_STR(EGL_BAD_ACCESS)
-		_CASE_CODE_RETURN_STR(EGL_BAD_ALLOC)
-		_CASE_CODE_RETURN_STR(EGL_BAD_ATTRIBUTE)
-		_CASE_CODE_RETURN_STR(EGL_BAD_CONTEXT)
-		_CASE_CODE_RETURN_STR(EGL_BAD_CONFIG)
-		_CASE_CODE_RETURN_STR(EGL_BAD_CURRENT_SURFACE)
-		_CASE_CODE_RETURN_STR(EGL_BAD_DISPLAY)
-		_CASE_CODE_RETURN_STR(EGL_BAD_SURFACE)
-		_CASE_CODE_RETURN_STR(EGL_BAD_MATCH)
-		_CASE_CODE_RETURN_STR(EGL_BAD_PARAMETER)
-		_CASE_CODE_RETURN_STR(EGL_BAD_NATIVE_PIXMAP)
-		_CASE_CODE_RETURN_STR(EGL_BAD_NATIVE_WINDOW)
-		_CASE_CODE_RETURN_STR(EGL_CONTEXT_LOST)
+		CASE_CODE_RETURN_STR(EGL_SUCCESS)
+		CASE_CODE_RETURN_STR(EGL_NOT_INITIALIZED)
+		CASE_CODE_RETURN_STR(EGL_BAD_ACCESS)
+		CASE_CODE_RETURN_STR(EGL_BAD_ALLOC)
+		CASE_CODE_RETURN_STR(EGL_BAD_ATTRIBUTE)
+		CASE_CODE_RETURN_STR(EGL_BAD_CONTEXT)
+		CASE_CODE_RETURN_STR(EGL_BAD_CONFIG)
+		CASE_CODE_RETURN_STR(EGL_BAD_CURRENT_SURFACE)
+		CASE_CODE_RETURN_STR(EGL_BAD_DISPLAY)
+		CASE_CODE_RETURN_STR(EGL_BAD_SURFACE)
+		CASE_CODE_RETURN_STR(EGL_BAD_MATCH)
+		CASE_CODE_RETURN_STR(EGL_BAD_PARAMETER)
+		CASE_CODE_RETURN_STR(EGL_BAD_NATIVE_PIXMAP)
+		CASE_CODE_RETURN_STR(EGL_BAD_NATIVE_WINDOW)
+		CASE_CODE_RETURN_STR(EGL_CONTEXT_LOST)
 		default:
 			return NULL;
 	}