summaryrefslogtreecommitdiff
path: root/FL/glut.H
diff options
context:
space:
mode:
Diffstat (limited to 'FL/glut.H')
-rw-r--r--FL/glut.H52
1 files changed, 26 insertions, 26 deletions
diff --git a/FL/glut.H b/FL/glut.H
index 9e727d6f6..3ab680519 100644
--- a/FL/glut.H
+++ b/FL/glut.H
@@ -1,5 +1,5 @@
//
-// "$Id: glut.H,v 1.6.2.6 2000/11/28 15:32:07 spitzak Exp $"
+// "$Id: glut.H,v 1.6.2.7 2000/12/06 15:45:12 easysw Exp $"
//
// GLUT emulation header file for the Fast Light Tool Kit (FLTK).
//
@@ -428,14 +428,14 @@ FL_EXPORT int glutBitmapWidth(void *font, int character);
extern "C" {
-extern APIENTRY int glutExtensionSupported(char *name);
+extern int APIENTRY glutExtensionSupported(char *name);
/* Stroke font opaque addresses (use constants instead in source code). */
-extern APIENTRY void *glutStrokeRoman;
-extern APIENTRY void *glutStrokeMonoRoman;
+extern void *glutStrokeRoman;
+extern void *glutStrokeMonoRoman;
/* Stroke font constants (use these in GLUT program). */
-#ifdef _WIN32
+#if defined(_WIN32) || defined(WIN32)
# define GLUT_STROKE_ROMAN ((void*)0)
# define GLUT_STROKE_MONO_ROMAN ((void*)1)
#else
@@ -444,33 +444,33 @@ extern APIENTRY void *glutStrokeMonoRoman;
#endif
/* GLUT font sub-API */
-extern APIENTRY void glutStrokeCharacter(void *font, int character);
-extern APIENTRY int glutStrokeWidth(void *font, int character);
+extern void APIENTRY glutStrokeCharacter(void *font, int character);
+extern int APIENTRY glutStrokeWidth(void *font, int character);
/* GLUT pre-built models sub-API */
-extern APIENTRY void glutWireSphere(GLdouble radius, GLint slices, GLint stacks);
-extern APIENTRY void glutSolidSphere(GLdouble radius, GLint slices, GLint stacks);
-extern APIENTRY void glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-extern APIENTRY void glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
-extern APIENTRY void glutWireCube(GLdouble size);
-extern APIENTRY void glutSolidCube(GLdouble size);
-extern APIENTRY void glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-extern APIENTRY void glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
-extern APIENTRY void glutWireDodecahedron();
-extern APIENTRY void glutSolidDodecahedron();
-extern APIENTRY void glutWireTeapot(GLdouble size);
-extern APIENTRY void glutSolidTeapot(GLdouble size);
-extern APIENTRY void glutWireOctahedron();
-extern APIENTRY void glutSolidOctahedron();
-extern APIENTRY void glutWireTetrahedron();
-extern APIENTRY void glutSolidTetrahedron();
-extern APIENTRY void glutWireIcosahedron();
-extern APIENTRY void glutSolidIcosahedron();
+extern void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks);
+extern void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks);
+extern void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
+extern void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
+extern void APIENTRY glutWireCube(GLdouble size);
+extern void APIENTRY glutSolidCube(GLdouble size);
+extern void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
+extern void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
+extern void APIENTRY glutWireDodecahedron();
+extern void APIENTRY glutSolidDodecahedron();
+extern void APIENTRY glutWireTeapot(GLdouble size);
+extern void APIENTRY glutSolidTeapot(GLdouble size);
+extern void APIENTRY glutWireOctahedron();
+extern void APIENTRY glutSolidOctahedron();
+extern void APIENTRY glutWireTetrahedron();
+extern void APIENTRY glutSolidTetrahedron();
+extern void APIENTRY glutWireIcosahedron();
+extern void APIENTRY glutSolidIcosahedron();
}
#endif /* __glut_h__ */
//
-// End of "$Id: glut.H,v 1.6.2.6 2000/11/28 15:32:07 spitzak Exp $".
+// End of "$Id: glut.H,v 1.6.2.7 2000/12/06 15:45:12 easysw Exp $".
//