Fix a clash with some standard MSVC defines (yeah MS) :-(

diff --git a/FlightGear.dsp b/FlightGear.dsp
index e5e370e37dc7c0de69a743c2d7136e3801c26921..576548f504752f78e6240b0844b4005ef3c0ffc5 100644 (file)
--- a/FlightGear.dsp
+++ b/FlightGear.dsp
@@ -4416,6 +4416,40 @@ SOURCE=.\src\GUI\trackball.h
 \r
 !ENDIF \r
 \r
+# End Source File\r
+# End Group\r
+# Begin Group "Lib_Input"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Input\input.cxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Input"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Input"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\src\Input\input.hxx\r
+\r
+!IF  "$(CFG)" == "FlightGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_Input"\r
+\r
+!ELSEIF  "$(CFG)" == "FlightGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_Input"\r
+\r
+!ENDIF \r
+\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_Joystick"\r

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index a309b14d928957c61a1ffa7a096ff71710092831..b6e8b6d66f51ab150f75bcdd56e62a45382cf4bc 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -248,20 +248,20 @@ FGInput::init ()
     globals->get_props()->getNode("/input/keyboard", true);
   vector<const SGPropertyNode *> keys = keyboard->getChildren("key");
 
-  for (int i = 0; i < keys.size(); i++) {
+  for (unsigned int i = 0; i < keys.size(); i++) {
     int index = keys[i]->getIndex();
-    int modifiers = MOD_NONE;
+    int modifiers = FG_MOD_NONE;
     if (keys[i]->getBoolValue("mod-shift"))
-      modifiers |= MOD_SHIFT;
+      modifiers |= FG_MOD_SHIFT;
     if (keys[i]->getBoolValue("mod-ctrl"))
-      modifiers |= MOD_CTRL;
+      modifiers |= FG_MOD_CTRL;
     if (keys[i]->getBoolValue("mod-alt"))
-      modifiers |= MOD_ALT;
+      modifiers |= FG_MOD_ALT;
     SG_LOG(SG_INPUT, SG_INFO, "Binding key " << index
           << " with modifiers " << modifiers);
 
     vector<const SGPropertyNode *> bindings = keys[i]->getChildren("binding");
-    for (int j = 0; j < bindings.size(); j++) {
+    for (unsigned int j = 0; j < bindings.size(); j++) {
       SG_LOG(SG_INPUT, SG_INFO, "  Adding binding " << j);
       _key_bindings[modifiers][index].push_back(FGBinding(bindings[j]));
     }
@@ -298,7 +298,7 @@ FGInput::doKey (int k, int modifiers, int x, int y)
 
   if (_key_bindings[modifiers].find(k) != _key_bindings[modifiers].end()) {
     const vector<FGBinding> &bindings = _key_bindings[modifiers][k];
-    for (int i = 0; i < bindings.size(); i++) {
+    for (unsigned int i = 0; i < bindings.size(); i++) {
       bindings[i].fire();
     }
     return;
@@ -312,7 +312,7 @@ FGInput::doKey (int k, int modifiers, int x, int y)
   
   // everything after here will be removed sooner or later...
 
-  if (modifiers & MOD_SHIFT) {
+  if (modifiers & FG_MOD_SHIFT) {
 
        switch (k) {
        case 7: // Ctrl-G key

diff --git a/src/Input/input.hxx b/src/Input/input.hxx
index d3bae03b45df6cf1736dc6722b6f9bde7c5a29b9..2e2dc87033420926f6a3b0e64bf5a31ae03a63c0 100644 (file)
--- a/src/Input/input.hxx
+++ b/src/Input/input.hxx
@@ -100,11 +100,11 @@ class FGInput : public FGSubsystem
 public:
 
   enum {
-    MOD_NONE = 0,
-    MOD_SHIFT = 1,
-    MOD_CTRL = 2,
-    MOD_ALT = 4,
-    MOD_MAX = 8                        // one past all modifiers
+    FG_MOD_NONE = 0,
+    FG_MOD_SHIFT = 1,
+    FG_MOD_CTRL = 2,
+    FG_MOD_ALT = 4,
+    FG_MOD_MAX = 8                     // one past all modifiers
   };
 
   FGInput();
@@ -129,9 +129,9 @@ public:
    * @param modifiers Modifier keys pressed (bitfield).
    * @param x The mouse x position at the time of keypress.
    * @param y The mouse y position at the time of keypress.
-   * @see #MOD_SHIFT
-   * @see #MOD_CTRL
-   * @see #MOD_ALT
+   * @see #FG_MOD_SHIFT
+   * @see #FG_MOD_CTRL
+   * @see #FG_MOD_ALT
    */
   virtual void doKey (int k, int modifiers, int x, int y);
 
@@ -175,7 +175,7 @@ public:
 private:
 
   typedef map<int,vector<FGBinding> > keyboard_map;
-  keyboard_map _key_bindings[MOD_MAX];
+  keyboard_map _key_bindings[FG_MOD_MAX];
 
 };
 

diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx
index 7882c8ff25c9c91839c983e9c0087b1c5650a207..706ba2aaee4af1df91aeda9de182689197c58c84 100644 (file)
--- a/src/Main/keyboard.cxx
+++ b/src/Main/keyboard.cxx
@@ -47,11 +47,11 @@ static inline int get_mods ()
   int modifiers = 0;
 
   if (glut_modifiers & GLUT_ACTIVE_SHIFT)
-    modifiers |= FGInput::MOD_SHIFT;
+    modifiers |= FGInput::FG_MOD_SHIFT;
   if (glut_modifiers & GLUT_ACTIVE_CTRL)
-    modifiers |= FGInput::MOD_CTRL;
+    modifiers |= FGInput::FG_MOD_CTRL;
   if (glut_modifiers & GLUT_ACTIVE_ALT)
-    modifiers |= FGInput::MOD_ALT;
+    modifiers |= FGInput::FG_MOD_ALT;
 
   return modifiers;
 }