4 files changed, 6 insertions, 6 deletions
diff --git a/src/glut/glx/glut_bitmap.c b/src/glut/glx/glut_bitmap.c
index f471167810e..8fec7f11710 100644
--- a/src/glut/glx/glut_bitmap.c
+++ b/src/glut/glx/glut_bitmap.c
@@ -16,7 +16,7 @@ glutBitmapCharacter(GLUTbitmapFont font, int c)
   GLint swapbytes, lsbfirst, rowlength;
   GLint skiprows, skippixels, alignment;
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(GLUT_IMPORT_LIB)
   fontinfo = (BitmapFontPtr) __glutFont(font);
 #else
   fontinfo = (BitmapFontPtr) font;
diff --git a/src/glut/glx/glut_bwidth.c b/src/glut/glx/glut_bwidth.c
index 34776f8b0f3..f9cdb184da7 100644
--- a/src/glut/glx/glut_bwidth.c
+++ b/src/glut/glx/glut_bwidth.c
@@ -15,7 +15,7 @@ glutBitmapWidth(GLUTbitmapFont font, int c)
   BitmapFontPtr fontinfo;
   const BitmapCharRec *ch;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(GLUT_IMPORT_LIB)
   fontinfo = (BitmapFontPtr) __glutFont(font);
 #else
   fontinfo = (BitmapFontPtr) font;
@@ -37,7 +37,7 @@ glutBitmapLength(GLUTbitmapFont font, const unsigned char *string)
   BitmapFontPtr fontinfo;
   const BitmapCharRec *ch;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(GLUT_IMPORT_LIB)
   fontinfo = (BitmapFontPtr) __glutFont(font);
 #else
   fontinfo = (BitmapFontPtr) font;
diff --git a/src/glut/glx/glut_stroke.c b/src/glut/glx/glut_stroke.c
index a7af66201fe..7569012ec4e 100644
--- a/src/glut/glx/glut_stroke.c
+++ b/src/glut/glx/glut_stroke.c
@@ -18,7 +18,7 @@ glutStrokeCharacter(GLUTstrokeFont font, int c)
   int i, j;
 
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(GLUT_IMPORT_LIB)
   fontinfo = (StrokeFontPtr) __glutFont(font);
 #else
   fontinfo = (StrokeFontPtr) font;
diff --git a/src/glut/glx/glut_swidth.c b/src/glut/glx/glut_swidth.c
index d999b4d38c4..4717bbff5b1 100644
--- a/src/glut/glx/glut_swidth.c
+++ b/src/glut/glx/glut_swidth.c
@@ -15,7 +15,7 @@ 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;
@@ -37,7 +37,7 @@ glutStrokeLength(GLUTstrokeFont font, const unsigned char *string)
   StrokeFontPtr fontinfo;
   const StrokeCharRec *ch;
 
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(GLUT_IMPORT_LIB)
   fontinfo = (StrokeFontPtr) __glutFont(font);
 #else
   fontinfo = (StrokeFontPtr) font;