[Xorg-commit] xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface glinterface.cc,1.1,1.1.4.1

Kaleb Keithley xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007


Committed by: kaleb

Update of /cvs/xorg/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface

Modified Files:
      Tag: XORG-CURRENT
	glinterface.cc 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: glinterface.cc
===================================================================
RCS file: /cvs/xorg/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glinterface.cc,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/glinterface.cc	14 Nov 2003 16:48:24 -0000	1.1
+++ b/glinterface.cc	23 Feb 2004 21:33:24 -0000	1.1.4.1
@@ -32,7 +32,7 @@
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
 */
-/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glinterface.cc,v 1.3 2001/04/03 02:18:40 dawes Exp $ */
+/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glinterface.cc,v 1.4 2004/02/01 02:12:07 dawes Exp $ */
 
 #include "gluos.h"
 #include <GL/gl.h>
@@ -426,7 +426,7 @@
 }
 
 extern "C" void GLAPIENTRY
-gluNurbsCallback(GLUnurbs *r, GLenum which, GLvoid (*fn)(GLvoid))
+gluNurbsCallback(GLUnurbs *r, GLenum which, GLvoid (*fn)())
 {
     switch (which) {
     case GLU_NURBS_BEGIN:





More information about the xorg-commit mailing list