OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch error fixup

Browse Source
This commit is contained in:
Ted Jump
1999-09-17 03:17:18 +00:00
parent 1f256fd6b3
commit d29b1c2ea6
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/glu/mesa/glu.c
View File

@@ -1,4 +1,4 @@
/* $Id: glu.c,v 1.12 1999/09/17 03:07:28 tjump Exp $ */ /* $Id: glu.c,v 1.13 1999/09/17 03:17:18 tjump Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@@ -23,6 +23,9 @@
/* /*
* $Log: glu.c,v $ * $Log: glu.c,v $
* Revision 1.13 1999/09/17 03:17:18 tjump
* Patch error fixup
*
* Revision 1.12 1999/09/17 03:07:28 tjump * Revision 1.12 1999/09/17 03:07:28 tjump
* Win32 build req't updates * Win32 build req't updates
* *
@@ -376,11 +379,7 @@ const GLubyte* GLAPIENTRY gluGetString( GLenum name )
/* for BeOS R4.5 */ /* for BeOS R4.5 */
gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName) gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName)
#else #else
<<<<<<< glu.c
gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName) gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName)
=======
void GLAPIENTRY (*gluGetProcAddressEXT(const GLubyte *procName))()
>>>>>>> 1.11
#endif #endif
{ {
struct proc { struct proc {