Use new Simgear platform defines in Input code.

diff --git a/src/Input/FGCommonInput.hxx b/src/Input/FGCommonInput.hxx
index 55851002168ae4098bf3c4c451d77a707b239bf6..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"

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index d32c207d52deed20692a34d4e60bf68413ce1e65..3804e8e9408c404ffb7a4ecb1fdcb487d7c21d8e 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -27,16 +27,19 @@
 #endif
 
 #include "input.hxx"
+
+#include <simgear/compiler.h>
+
 #include "FGMouseInput.hxx"
 #include "FGKeyboardInput.hxx"
 #include "FGJoystickInput.hxx"
 
 #ifdef WITH_EVENTINPUT
-#if defined( UL_WIN32 )
+#if defined( SG_WINDOWS )
 //to be developed
 //#include "FGDirectXEventInput.hxx"
 //#define INPUTEVENT_CLASS FGDirectXEventInput
-#elif defined ( UL_MAC_OSX )
+#elif defined ( SG_MAC )
 #include "FGMacOSXEventInput.hxx"
 #define INPUTEVENT_CLASS FGMacOSXEventInput
 #else