diff options
| author | Sven Gothel <[email protected]> | 2015-03-06 10:02:03 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-06 10:02:03 +0100 |
| commit | 27ebb38b9ffd3cc8f4ee3b97509b0f32ef2680aa (patch) | |
| tree | 5a50541643e21ae1a3d49d65c405cdefa4b64569 /src/jogl/native | |
| parent | eced1d4e45772a862d649e3cd7b500c6bc1643a1 (diff) | |
Bug 1135 - Cleanup: Fix native code Warning
Diffstat (limited to 'src/jogl/native')
| -rw-r--r-- | src/jogl/native/EGLContext.c | 5 | ||||
| -rw-r--r-- | src/jogl/native/GLDebugMessageHandler.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/jogl/native/EGLContext.c b/src/jogl/native/EGLContext.c index 7bf60b850..fac0670e6 100644 --- a/src/jogl/native/EGLContext.c +++ b/src/jogl/native/EGLContext.c @@ -16,10 +16,11 @@ */ JNIEXPORT jlong JNICALL Java_jogamp_opengl_egl_EGLContext_dispatch_1eglGetProcAddress0__Ljava_lang_String_2J(JNIEnv *env, jclass _unused, jstring procname, jlong procAddress) { - typedef __EGLFuncPtr (EGLAPIENTRY*_local_PFNEGLGETPROCADDRESSPROC)(const char * procname); + typedef void (* EGLAPIENTRY _local_EGLFuncPtr)(void); + typedef _local_EGLFuncPtr (EGLAPIENTRY*_local_PFNEGLGETPROCADDRESSPROC)(const char * procname); _local_PFNEGLGETPROCADDRESSPROC ptr_eglGetProcAddress; const char* _strchars_procname = NULL; - __EGLFuncPtr _res; + _local_EGLFuncPtr _res; if ( NULL != procname ) { _strchars_procname = (*env)->GetStringUTFChars(env, procname, (jboolean*)NULL); if ( NULL == _strchars_procname ) { diff --git a/src/jogl/native/GLDebugMessageHandler.c b/src/jogl/native/GLDebugMessageHandler.c index 0aa7a01e7..5c18b94b1 100644 --- a/src/jogl/native/GLDebugMessageHandler.c +++ b/src/jogl/native/GLDebugMessageHandler.c @@ -21,11 +21,11 @@ static jmethodID glDebugMessageARB = NULL; // int source, int type, int id, int severity, String msg static jmethodID glDebugMessageAMD = NULL; // int id, int category, int severity, String msg -typedef void (APIENTRY* _local_PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const GLvoid *userParam); -typedef void (APIENTRY* _local_GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); +typedef void (APIENTRY* _local_GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); +typedef void (APIENTRY* _local_PFNGLDEBUGMESSAGECALLBACKARBPROC) (_local_GLDEBUGPROCARB callback, const void *userParam); -typedef void (APIENTRY* _local_PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, const GLvoid *userParam); -typedef void (APIENTRY* _local_GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); +typedef void (APIENTRY* _local_GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam); +typedef void (APIENTRY* _local_PFNGLDEBUGMESSAGECALLBACKAMDPROC) (_local_GLDEBUGPROCAMD callback, void *userParam); /* * Class: jogamp_opengl_GLDebugMessageHandler |