diff options
| author | Brian Paul <[email protected]> | 1999-09-17 12:21:36 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 1999-09-17 12:21:36 +0000 |
| commit | 1bf28c46c2d4d3f2d0a502e45abfa66d37afe733 (patch) | |
| tree | f8bbb2d64ee64b1fb4d6380cb6102c97c8fb95cc /src/glu/mesa | |
| parent | 9b563507cb00399faadafb72f6fa2b60ed0c8378 (diff) | |
glGetProcAddressEXT changes to accomodate Win32 and non-Win32
Diffstat (limited to 'src/glu/mesa')
| -rw-r--r-- | src/glu/mesa/glu.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/glu/mesa/glu.c b/src/glu/mesa/glu.c index 110e267aa8f..e844633906f 100644 --- a/src/glu/mesa/glu.c +++ b/src/glu/mesa/glu.c @@ -1,4 +1,4 @@ -/* $Id: glu.c,v 1.13 1999/09/17 03:17:18 tjump Exp $ */ +/* $Id: glu.c,v 1.14 1999/09/17 12:21:53 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -23,6 +23,9 @@ /* * $Log: glu.c,v $ + * Revision 1.14 1999/09/17 12:21:53 brianp + * glGetProcAddressEXT changes to accomodate Win32 and non-Win32 + * * Revision 1.13 1999/09/17 03:17:18 tjump * Patch error fixup * @@ -376,10 +379,12 @@ const GLubyte* GLAPIENTRY gluGetString( GLenum name ) #ifdef GLU_EXT_get_proc_address #ifdef __cplusplus -/* for BeOS R4.5 */ -gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName) + /* for BeOS R4.5 */ + void GLAPIENTRY (*gluGetProcAddressEXT(const GLubyte *procName))(...) +#elif defined(__WIN32__) + gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName) #else -gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName) + void GLAPIENTRY (*gluGetProcAddressEXT(const GLubyte *procName))() #endif { struct proc { @@ -407,7 +412,11 @@ gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName) for (i = 0; procTable[i].address; i++) { if (strcmp((const char *) procName, procTable[i].name) == 0) +#ifdef __WIN32__ return (gluProcAddress) procTable[i].address; +#else + return (void (*)()) procTable[i].address; +#endif } return NULL; |