diff --git a/3rdparty/joystick/js.h b/3rdparty/joystick/FlightGear_js.h similarity index 100% rename from 3rdparty/joystick/js.h rename to 3rdparty/joystick/FlightGear_js.h diff --git a/3rdparty/joystick/js.cxx b/3rdparty/joystick/js.cxx index 15d584e68..42b03fe3a 100644 --- a/3rdparty/joystick/js.cxx +++ b/3rdparty/joystick/js.cxx @@ -22,7 +22,7 @@ #include "config.h" -#include "js.h" +#include "FlightGear_js.h" #include <simgear/debug/logstream.hxx> diff --git a/3rdparty/joystick/jsBSD.cxx b/3rdparty/joystick/jsBSD.cxx index 91b113c00..50b09b285 100644 --- a/3rdparty/joystick/jsBSD.cxx +++ b/3rdparty/joystick/jsBSD.cxx @@ -36,7 +36,7 @@ * would need to understand that. */ -#include "js.h" +#include "FlightGear_js.h" #if defined(__NetBSD__) || defined(__FreeBSD__) #define HAVE_USB_JS 1 diff --git a/3rdparty/joystick/jsLinux.cxx b/3rdparty/joystick/jsLinux.cxx index aa43e266c..88fc64ab3 100644 --- a/3rdparty/joystick/jsLinux.cxx +++ b/3rdparty/joystick/jsLinux.cxx @@ -21,7 +21,7 @@ $Id: jsLinux.cxx 2017 2005-02-21 07:37:25Z bram $ */ -#include "js.h" +#include "FlightGear_js.h" #include <unistd.h> #include <linux/joystick.h> diff --git a/3rdparty/joystick/jsMacOSX.cxx b/3rdparty/joystick/jsMacOSX.cxx index 577d209f3..e664bd1f3 100644 --- a/3rdparty/joystick/jsMacOSX.cxx +++ b/3rdparty/joystick/jsMacOSX.cxx @@ -21,7 +21,7 @@ $Id: jsMacOSX.cxx 2165 2011-01-22 22:56:03Z fayjf $ */ -#include "js.h" +#include "FlightGear_js.h" #include <mach/mach.h> #include <IOKit/IOKitLib.h> diff --git a/3rdparty/joystick/jsNone.cxx b/3rdparty/joystick/jsNone.cxx index f4f1d8c72..0d2452f35 100644 --- a/3rdparty/joystick/jsNone.cxx +++ b/3rdparty/joystick/jsNone.cxx @@ -20,7 +20,7 @@ $Id: jsNone.cxx 1960 2004-09-21 11:45:55Z smokydiamond $ */ -#include "js.h" +#include "FlightGear_js.h" #ifdef __OpenBSD__ #define TRUE JS_TRUE diff --git a/3rdparty/joystick/jsWindows.cxx b/3rdparty/joystick/jsWindows.cxx index 567fef5e7..fc0af4901 100644 --- a/3rdparty/joystick/jsWindows.cxx +++ b/3rdparty/joystick/jsWindows.cxx @@ -23,7 +23,7 @@ #include <string> -#include "js.h" +#include "FlightGear_js.h" #include <Windows.h> diff --git a/src/Input/FGJoystickInput.hxx b/src/Input/FGJoystickInput.hxx index c2d6239b5..f93302dcd 100644 --- a/src/Input/FGJoystickInput.hxx +++ b/src/Input/FGJoystickInput.hxx @@ -31,7 +31,7 @@ #include <memory> // for std::unique_ptr #include <simgear/structure/subsystem_mgr.hxx> -#include <js.h> +#include "FlightGear_js.h" //////////////////////////////////////////////////////////////////////// // The Joystick Input Class diff --git a/src/Input/js_demo.cxx b/src/Input/js_demo.cxx index 3d58375fe..8db6d059c 100644 --- a/src/Input/js_demo.cxx +++ b/src/Input/js_demo.cxx @@ -1,6 +1,4 @@ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> #ifdef HAVE_WINDOWS_H # include <windows.h> @@ -8,8 +6,7 @@ # include <unistd.h> // for usleep #endif -#include <string.h> // plib/js.h should really include this !!!!!! -#include <js.h> +#include "FlightGear_js.h" #define Z 8 diff --git a/src/Input/jssuper.h b/src/Input/jssuper.h index 86eed5778..81b0e20c0 100644 --- a/src/Input/jssuper.h +++ b/src/Input/jssuper.h @@ -21,11 +21,9 @@ #ifndef _JSSUPER_H #define _JSSUPER_H -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> -#include "js.h" +#include "FlightGear_js.h" #define MAX_JOYSTICKS 8 diff --git a/utils/js_server/js_server.cxx b/utils/js_server/js_server.cxx index a0bb9d3a1..667a1b4b4 100644 --- a/utils/js_server/js_server.cxx +++ b/utils/js_server/js_server.cxx @@ -30,7 +30,8 @@ #include <stdint.h> #include <plib/netSocket.h> -#include <plib/js.h> + +#include "FlightGear_js.h" void usage(char * progname) {