Rename js.h -> FlightGear_js.h
Ensure we don’t get weird conflicts as our internal version is starting to diverge from the original PLIB one.
This commit is contained in:
parent
00cffc2f01
commit
dce282d7b8
11 changed files with 13 additions and 17 deletions
2
3rdparty/joystick/js.cxx
vendored
2
3rdparty/joystick/js.cxx
vendored
|
@ -22,7 +22,7 @@
|
|||
|
||||
#include "config.h"
|
||||
|
||||
#include "js.h"
|
||||
#include "FlightGear_js.h"
|
||||
|
||||
#include <simgear/debug/logstream.hxx>
|
||||
|
||||
|
|
2
3rdparty/joystick/jsBSD.cxx
vendored
2
3rdparty/joystick/jsBSD.cxx
vendored
|
@ -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
|
||||
|
|
2
3rdparty/joystick/jsLinux.cxx
vendored
2
3rdparty/joystick/jsLinux.cxx
vendored
|
@ -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>
|
||||
|
|
2
3rdparty/joystick/jsMacOSX.cxx
vendored
2
3rdparty/joystick/jsMacOSX.cxx
vendored
|
@ -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>
|
||||
|
|
2
3rdparty/joystick/jsNone.cxx
vendored
2
3rdparty/joystick/jsNone.cxx
vendored
|
@ -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
|
||||
|
|
2
3rdparty/joystick/jsWindows.cxx
vendored
2
3rdparty/joystick/jsWindows.cxx
vendored
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include "js.h"
|
||||
#include "FlightGear_js.h"
|
||||
|
||||
#include <Windows.h>
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -30,7 +30,8 @@
|
|||
#include <stdint.h>
|
||||
|
||||
#include <plib/netSocket.h>
|
||||
#include <plib/js.h>
|
||||
|
||||
#include "FlightGear_js.h"
|
||||
|
||||
void usage(char * progname)
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue