Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Input / FGCommonInput.hxx

diff --git a/src/Input/FGCommonInput.hxx b/src/Input/FGCommonInput.hxx
index 7eee91526b04e90670c4f127d19f94146fb8fd89..cc427d6392750a639b714b561ad06958018139a4 100644 (file)
--- a/src/Input/FGCommonInput.hxx
+++ b/src/Input/FGCommonInput.hxx
@@ -27,10 +27,11 @@
 
 #include <vector>
 #include <simgear/structure/SGBinding.hxx>
+#include <simgear/compiler.h>
 
-#if defined( UL_WIN32 )
+#if defined( SG_WINDOWS )
 #define TGT_PLATFORM   "windows"
-#elif defined ( UL_MAC_OSX )
+#elif defined ( SG_MAC )
 #define TGT_PLATFORM    "mac"
 #else
 #define TGT_PLATFORM   "unix"
@@ -38,14 +39,14 @@
 
 class FGCommonInput {
 public:
-  typedef vector<SGSharedPtr<SGBinding> > binding_list_t;
+  typedef std::vector<SGSharedPtr<SGBinding> > binding_list_t;
 
   /*
    read all "binding" nodes directly under the specified base node and fill the 
    vector of SGBinding supplied in binding_list. Reads all the mod-xxx bindings and 
    add the corresponding SGBindings.
    */
-  static void read_bindings (const SGPropertyNode * base, binding_list_t * binding_list, int modifiers, string & module );
+  static void read_bindings (const SGPropertyNode * base, binding_list_t * binding_list, int modifiers, const std::string & module );
 };
 
 #endif