r300: Fix errant inlines.

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

diff --git a/src/glut/glx/glut_bwidth.c b/src/glut/glx/glut_bwidth.c
index bee5e8827ea4a72b19a6661f859484890898172a..f9cdb184da7bc7dbe87ff4f0a2d8d36bb8ca06e8 100644 (file)
--- a/src/glut/glx/glut_bwidth.c
+++ b/src/glut/glx/glut_bwidth.c
@@ -9,13 +9,13 @@
 #include "glutbitmap.h"
 
 /* CENTRY */
-int APIENTRY 
+int GLUTAPIENTRY 
 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;
@@ -30,14 +30,14 @@ glutBitmapWidth(GLUTbitmapFont font, int c)
     return 0;
 }
 
-int APIENTRY 
+int GLUTAPIENTRY 
 glutBitmapLength(GLUTbitmapFont font, const unsigned char *string)
 {
   int c, length;
   BitmapFontPtr fontinfo;
   const BitmapCharRec *ch;
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(GLUT_IMPORT_LIB)
   fontinfo = (BitmapFontPtr) __glutFont(font);
 #else
   fontinfo = (BitmapFontPtr) font;