Fixed namespace pollution due to a number of global symbols missing an fg prefix

[freeglut] / src / fg_spaceball.c

diff --git a/src/fg_spaceball.c b/src/fg_spaceball.c
index b1b321c..93727a1 100644 (file)
--- a/src/fg_spaceball.c
+++ b/src/fg_spaceball.c
@@ -7,9 +7,12 @@
  * magellan X-based protocol.
  */
 
+
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
+#if( !_WIN32 || _WIN32_WINNT >= 0x0501)
+
 /* -- PRIVATE FUNCTIONS --------------------------------------------------- */
 
 extern void fgPlatformInitializeSpaceball(void);
@@ -19,28 +22,27 @@ extern int fgPlatformSpaceballNumButtons(void);
 extern void fgPlatformSpaceballSetWindow(SFG_Window *window);
 
 
-int sball_initialized = 0;
+int fg_sball_initialized = 0;
 
 void fgInitialiseSpaceball(void)
 {
-    if(sball_initialized != 0) {
+    if(fg_sball_initialized != 0) {
         return;
     }
 
     fgPlatformInitializeSpaceball();
-
-    sball_initialized = 1;
 }
 
 void fgSpaceballClose(void)
 {
-       fgPlatformSpaceballClose();}
+    fgPlatformSpaceballClose();
+}
 
 int fgHasSpaceball(void)
 {
-    if(sball_initialized == 0) {
+    if(fg_sball_initialized == 0) {
         fgInitialiseSpaceball();
-        if(sball_initialized != 1) {
+        if(fg_sball_initialized != 1) {
             fgWarning("fgInitialiseSpaceball failed\n");
             return 0;
         }
@@ -51,9 +53,9 @@ int fgHasSpaceball(void)
 
 int fgSpaceballNumButtons(void)
 {
-    if(sball_initialized == 0) {
+    if(fg_sball_initialized == 0) {
         fgInitialiseSpaceball();
-        if(sball_initialized != 1) {
+        if(fg_sball_initialized != 1) {
             fgWarning("fgInitialiseSpaceball failed\n");
             return 0;
         }
@@ -64,9 +66,9 @@ int fgSpaceballNumButtons(void)
 
 void fgSpaceballSetWindow(SFG_Window *window)
 {
-    if(sball_initialized == 0) {
+    if(fg_sball_initialized == 0) {
         fgInitialiseSpaceball();
-        if(sball_initialized != 1) {
+        if(fg_sball_initialized != 1) {
             return;
         }
     }
@@ -74,3 +76,28 @@ void fgSpaceballSetWindow(SFG_Window *window)
     fgPlatformSpaceballSetWindow(window);
 }
 
+#else
+
+void fgInitialiseSpaceball(void)
+{
+}
+
+void fgSpaceballClose(void)
+{
+}
+
+int fgHasSpaceball(void)
+{
+    return 0;
+}
+
+int fgSpaceballNumButtons(void)
+{
+    return 0;
+}
+
+void fgSpaceballSetWindow(SFG_Window *window)
+{
+}
+
+#endif