Uploading spaceball/set-window patch per e-mail from John Tsiombikas dated 1:34 PM...

[freeglut] / src / freeglut_input_devices.c

diff --git a/src/freeglut_input_devices.c b/src/freeglut_input_devices.c
index 493bcd8..0dcb97f 100755 (executable)
--- a/src/freeglut_input_devices.c
+++ b/src/freeglut_input_devices.c
@@ -35,8 +35,10 @@
 #include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
-#if TARGET_HOST_UNIX_X11
+#if TARGET_HOST_POSIX_X11
+#if HAVE_ERRNO_H
 #include <errno.h>
+#endif
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <time.h>
@@ -53,7 +55,7 @@ typedef struct {
    struct termios termio, termio_save;
 } SERIALPORT;
 
-#elif TARGET_HOST_WIN32
+#elif TARGET_HOST_MS_WINDOWS
 #include <sys/types.h>
 #include <winbase.h>
 typedef struct {
@@ -136,11 +138,11 @@ int fgInputDeviceDetect( void )
  */
 void fgInitialiseInputDevices ( void )
 {
-    const char *dial_device=NULL;
     if( !fgState.InputDevsInitialised )
     {
+        const char *dial_device=NULL;
         dial_device = getenv ( "GLUT_DIALS_SERIAL" );
-#if TARGET_HOST_WIN32
+#if TARGET_HOST_MS_WINDOWS
         if (!dial_device){
             static char devname[256];
             DWORD size=sizeof(devname);
@@ -250,7 +252,7 @@ static void poll_dials ( int id )
 
 
 /******** OS Specific Serial I/O routines *******/
-#if TARGET_HOST_UNIX_X11 /* ==> Linux/BSD/UNIX POSIX serial I/O */
+#if TARGET_HOST_POSIX_X11 /* ==> Linux/BSD/UNIX POSIX serial I/O */
 static SERIALPORT *serial_open ( const char *device )
 {
     int fd;
@@ -313,7 +315,7 @@ static void serial_flush ( SERIALPORT *port )
     tcflush ( port->fd, TCIOFLUSH );
 }
 
-#elif TARGET_HOST_WIN32
+#elif TARGET_HOST_MS_WINDOWS
 
 static SERIALPORT *serial_open(const char *device){
     HANDLE fh;