projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing compiler warnings in MSVC 2005 build
[freeglut]
/
src
/
freeglut_cursor.c
diff --git
a/src/freeglut_cursor.c
b/src/freeglut_cursor.c
index
66ed155
..
390e0cb
100644
(file)
--- a/
src/freeglut_cursor.c
+++ b/
src/freeglut_cursor.c
@@
-28,7
+28,7
@@
#include <GL/freeglut.h>
#include "freeglut_internal.h"
#include <GL/freeglut.h>
#include "freeglut_internal.h"
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
#include <X11/cursorfont.h>
#endif
#include <X11/cursorfont.h>
#endif
@@
-43,7
+43,7
@@
/* -- PRIVATE FUNCTIONS --------------------------------------------------- */
/* -- PRIVATE FUNCTIONS --------------------------------------------------- */
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
/*
* A factory method for an empty cursor
*/
/*
* A factory method for an empty cursor
*/
@@
-111,7
+111,7
@@
static cursorCacheEntry cursorCache[] = {
*/
void fgSetCursor ( SFG_Window *window, int cursorID )
{
*/
void fgSetCursor ( SFG_Window *window, int cursorID )
{
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
{
Cursor cursor;
/*
{
Cursor cursor;
/*
@@
-156,10
+156,10
@@
void fgSetCursor ( SFG_Window *window, int cursorID )
}
}
}
}
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
/*
/*
- * This is a temporary solution only...
+ * Joe Krahn is re-writing the following code.
*/
/* Set the cursor AND change it for this window class. */
# define MAP_CURSOR(a,b) \
*/
/* Set the cursor AND change it for this window class. */
# define MAP_CURSOR(a,b) \
@@
-234,7
+234,7
@@
void FGAPIENTRY glutWarpPointer( int x, int y )
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );
FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutWarpPointer" );
FREEGLUT_EXIT_IF_NO_WINDOW ( "glutWarpPointer" );
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
XWarpPointer(
fgDisplay.Display,
XWarpPointer(
fgDisplay.Display,
@@
-246,7
+246,7
@@
void FGAPIENTRY glutWarpPointer( int x, int y )
/* Make the warp visible immediately. */
XFlush( fgDisplay.Display );
/* Make the warp visible immediately. */
XFlush( fgDisplay.Display );
-#elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE
+#elif TARGET_HOST_MS_WINDOWS
{
POINT coords;
{
POINT coords;