godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only include linux/joystick.h on linux

This commit is contained in:
Rob Messick 2014-02-23 12:20:27 -08:00
parent 0109fb4295
commit fd03693df1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/x11/os_x11.cpp
View File

@ -45,7 +45,10 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#ifdef __linux__
#include <linux/joystick.h> #include <linux/joystick.h>
#endif
//stupid linux.h //stupid linux.h
#ifdef KEY_TAB #ifdef KEY_TAB
@ -1031,7 +1034,6 @@ void OS_X11::close_joystick(int p_id) {
}; };
void OS_X11::probe_joystick(int p_id) { void OS_X11::probe_joystick(int p_id) {
if (p_id == -1) { if (p_id == -1) {
for (int i=0; i<JOYSTICKS_MAX; i++) { for (int i=0; i<JOYSTICKS_MAX; i++) {
@ -1073,7 +1075,6 @@ void OS_X11::move_window_to_foreground() {
} }
void OS_X11::process_joysticks() { void OS_X11::process_joysticks() {
int bytes; int bytes;
js_event events[32]; js_event events[32];
InputEvent ievent; InputEvent ievent;