diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-09-09 18:13:35 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-09-09 18:13:35 +0000 |
| commit | d86d1483ac7da934e935372722999164bfcf6ef7 (patch) | |
| tree | 8784a70572dfce97de7b7f9fb3ca4cbe1664d082 | |
| parent | c18fe0c92b69e25a95f773875825f092caa43cc2 (diff) | |
Another attempt at fixing name mangling and gl__unused413().
| -rw-r--r-- | include/GL/gl_mangle.h | 1 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_apitemp.py | 4 | ||||
| -rw-r--r-- | src/mesa/glapi/glapitemp.h | 4 |
3 files changed, 1 insertions, 8 deletions
diff --git a/include/GL/gl_mangle.h b/include/GL/gl_mangle.h index 8d3306b9fb..873be540ab 100644 --- a/include/GL/gl_mangle.h +++ b/include/GL/gl_mangle.h @@ -30,6 +30,7 @@ /* Internal symbols which may collide with other OpenGL implementations. */ #define __glCoreCreateContext __mglCoreCreateContext #define __glCoreNopDispatch __mglCoreNopDispatch +#define gl__unused413 MANGLE(__unused413) /*REGENERATE_TO_END-----------ALL LINES BELOW HERE GET REPLACED ON REGENERATION */ diff --git a/src/mesa/glapi/gl_apitemp.py b/src/mesa/glapi/gl_apitemp.py index 8070c4fccf..b8b32ac362 100644 --- a/src/mesa/glapi/gl_apitemp.py +++ b/src/mesa/glapi/gl_apitemp.py @@ -129,11 +129,7 @@ class PrintGlOffsets(gl_XML.FilterGLAPISpecBase): #error RETURN_DISPATCH must be defined #endif -#ifdef USE_MGL_NAMESPACE -GLAPI void GLAPIENTRY mgl__unused413(void); /* silence warning */ -#else GLAPI void GLAPIENTRY gl__unused413(void); /* silence warning */ -#endif """ return diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h index 9108826840..579494ce81 100644 --- a/src/mesa/glapi/glapitemp.h +++ b/src/mesa/glapi/glapitemp.h @@ -69,11 +69,7 @@ #error RETURN_DISPATCH must be defined #endif -#ifdef USE_MGL_NAMESPACE -GLAPI void GLAPIENTRY mgl__unused413(void); /* silence warning */ -#else GLAPI void GLAPIENTRY gl__unused413(void); /* silence warning */ -#endif KEYWORD1 void KEYWORD2 NAME(NewList)(GLuint list, GLenum mode) { |