cleanup and some WGL PIXELFORMAT issues

[mesa.git] / src / glut / glx / glut_swidth.c

diff --git a/src/glut/glx/glut_swidth.c b/src/glut/glx/glut_swidth.c
index e1b73745751c8e7d34c920f5346538778359f573..4717bbff5b1a03df3b735df893a9a73fda6805d1 100644 (file)
--- a/src/glut/glx/glut_swidth.c
+++ b/src/glut/glx/glut_swidth.c
@@ -9,13 +9,13 @@
 #include "glutstroke.h"
 
 /* CENTRY */
-int APIENTRY 
+int GLUTAPIENTRY 
 glutStrokeWidth(GLUTstrokeFont font, int c)
 {
   StrokeFontPtr fontinfo;
   const StrokeCharRec *ch;
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(GLUT_IMPORT_LIB)
   fontinfo = (StrokeFontPtr) __glutFont(font);
 #else
   fontinfo = (StrokeFontPtr) font;
@@ -30,14 +30,14 @@ glutStrokeWidth(GLUTstrokeFont font, int c)
     return 0;
 }
 
-int APIENTRY 
+int GLUTAPIENTRY 
 glutStrokeLength(GLUTstrokeFont font, const unsigned char *string)
 {
   int c, length;
   StrokeFontPtr fontinfo;
   const StrokeCharRec *ch;
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(GLUT_IMPORT_LIB)
   fontinfo = (StrokeFontPtr) __glutFont(font);
 #else
   fontinfo = (StrokeFontPtr) font;