X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Fglut.h;h=d05d59746cdf57769c2cf63727f2ad30bab25f1d;hb=a4b002457118502712cd8d3f67de997b2a65f162;hp=b694c78700aae62d9c905d8162eb2e3832fe8b44;hpb=60fc701ac5ebd652058a209dac1486d4c5089662;p=freeglut

diff --git a/include/GL/glut.h b/include/GL/glut.h
index b694c78..d05d597 100644
--- 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
@@ -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
@@ -73,11 +76,7 @@
  */
 #define  FREEGLUT             1
 #define  GLUT_API_VERSION     4
-#define  FREEGLUT_VERSION_1_3 1
-
-#define  VERSION_MAJOR        1
-#define  VERSION_MINOR        4
-#define  VERSION_PATCH        0
+#define  FREEGLUT_VERSION_2_0 1
 
 /*
  * Always include OpenGL and GLU headers
@@ -471,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
@@ -544,5 +543,5 @@ FGAPI void    FGAPIENTRY glutReportErrors( void );
 
 /*** END OF FILE ***/
 
-#endif /* GLUT_H */
+#endif /* __GLUT_H__ */