diff options
| author | Ted Jump <tjump@users.sourceforge.net> | 1999-09-17 03:17:18 +0000 |
|---|---|---|
| committer | Ted Jump <tjump@users.sourceforge.net> | 1999-09-17 03:17:18 +0000 |
| commit | d29b1c2ea6505aaca7d2ed8785c88a3468f68472 (patch) | |
| tree | 0d4bca3ebf3e76a2572e9aaa470e6ea563340712 /src/glu | |
| parent | 1f256fd6b39572e16cadb6460b865a128103bf18 (diff) | |
Patch error fixup
Diffstat (limited to 'src/glu')
| -rw-r--r-- | src/glu/mesa/glu.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/glu/mesa/glu.c b/src/glu/mesa/glu.c index d649ca86e1..110e267aa8 100644 --- a/src/glu/mesa/glu.c +++ b/src/glu/mesa/glu.c @@ -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 @@ -23,6 +23,9 @@ /* * $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 * Win32 build req't updates * @@ -376,11 +379,7 @@ const GLubyte* GLAPIENTRY gluGetString( GLenum name ) /* for BeOS R4.5 */ gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName) #else -<<<<<<< glu.c gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName) -======= -void GLAPIENTRY (*gluGetProcAddressEXT(const GLubyte *procName))() ->>>>>>> 1.11 #endif { struct proc { |