X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_cursor.c;h=bbe27cd2a8b87e4e50c05003b090358b7de1bae7;hb=db165b756c33137939afe0d77b8c01d120892693;hp=bf5d2eb8036d3c595d1344550f5a8b7fdae33cc4;hpb=006650e1dd72e73249d41e2bcea8b1668262a999;p=freeglut

diff --git a/src/freeglut_cursor.c b/src/freeglut_cursor.c
index bf5d2eb..bbe27cd 100644
--- a/src/freeglut_cursor.c
+++ b/src/freeglut_cursor.c
@@ -25,10 +25,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
@@ -83,8 +79,8 @@ static int fghGetCursorError( Cursor cursor )
  */
 void FGAPIENTRY glutSetCursor( int cursorID )
 {
-    freeglut_assert_ready;  /* XXX WHY do we need the timer active for this? */
-    freeglut_assert_window;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutSetCursor" );
+    FREEGLUT_EXIT_IF_NO_WINDOW ( "glutSetCursor" );
 
 #if TARGET_HOST_UNIX_X11
     /*
@@ -144,7 +140,7 @@ void FGAPIENTRY glutSetCursor( int cursorID )
              * need to pick a color for foreground/background---but what
              * one we pick doesn't matter for GLUT_CURSOR_NONE.
              */
-            static unsigned char no_cursor_bits[ 32 ];
+            static char no_cursor_bits[ 32 ];
             XColor black;
             no_cursor = XCreatePixmapFromBitmapData( fgDisplay.Display,
                                                      fgDisplay.RootWindow,
@@ -167,7 +163,7 @@ void FGAPIENTRY glutSetCursor( int cursorID )
             break;
 
         default:
-            fgWarning( "Unknown cursor type: %d\n", cursorID );
+            fgWarning( "Unknown cursor type: %d", cursorID );
             return;
         }
 
@@ -236,8 +232,8 @@ void FGAPIENTRY glutSetCursor( int cursorID )
  */
 void FGAPIENTRY glutWarpPointer( int x, int y )
 {
-    freeglut_assert_ready; /* XXX WHY do we need the timer active for this? */
-    freeglut_assert_window;
+    FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" );
+    FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );
 
 #if TARGET_HOST_UNIX_X11