Swept the freeglut_font.c for comment cleanup:

[freeglut] / include / GL / glut.h

diff --git a/include/GL/glut.h b/include/GL/glut.h
index 4278d88..d05d597 100644 (file)
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -1,5 +1,5 @@
-#ifndef  GLUT_H
-#define  GLUT_H
+#ifndef  __GLUT_H__
+#define  __GLUT_H__
 
 /*
  * freeglut.h
@@ -50,7 +50,7 @@
 
 #      if defined(FREEGLUT_EXPORTS)
 #              define FGAPI __declspec(dllexport)
-//#            define FGAPI
+/* #           define FGAPI */
 #      else
 #              define FGAPI __declspec(dllimport)
 #   pragma comment (lib, "freeglut.lib")    /* link with Win32 freeglut lib */
@@ -60,9 +60,12 @@
 #endif
 
 #pragma comment (lib, "winmm.lib")       /* link with Windows MultiMedia lib */
+#pragma comment (lib, "user32.lib") /* link with Windows user lib */
+#pragma comment (lib, "gdi32.lib") /* link with Windows GDI lib */
 #pragma comment (lib, "opengl32.lib")    /* link with Microsoft OpenGL lib */
 #pragma comment (lib, "glu32.lib")       /* link with OpenGL Utility lib */
 
+
 #else
 #      define FGAPI
 #      define FGAPIENTRY
@@ -71,8 +74,9 @@
 /*
  * The freeglut and GLUT API versions
  */
-#define  FREEGLUT          1
-#define  GLUT_API_VERSION  4
+#define  FREEGLUT             1
+#define  GLUT_API_VERSION     4
+#define  FREEGLUT_VERSION_2_0 1
 
 /*
  * Always include OpenGL and GLU headers
@@ -466,8 +470,8 @@ FGAPI void    FGAPIENTRY glutBitmapCharacter( void* font, int character );
 FGAPI int     FGAPIENTRY glutBitmapWidth( void* font, int character );
 FGAPI void    FGAPIENTRY glutStrokeCharacter( void* font, int character );
 FGAPI int     FGAPIENTRY glutStrokeWidth( void* font, int character );
-FGAPI int     FGAPIENTRY glutBitmapLength( void* font, const char* string );
-FGAPI int     FGAPIENTRY glutStrokeLength( void* font, const char* string );
+FGAPI int     FGAPIENTRY glutBitmapLength( void* font, const unsigned char* string );
+FGAPI int     FGAPIENTRY glutStrokeLength( void* font, const unsigned char* string );
 
 /*
  * Geometry functions, see freeglut_geometry.c
@@ -539,5 +543,5 @@ FGAPI void    FGAPIENTRY glutReportErrors( void );
 
 /*** END OF FILE ***/
 
-#endif /* GLUT_H */
+#endif /* __GLUT_H__ */