diff options
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index bd60cf480e..3218230d0b 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -32,7 +32,6 @@ #include "key_mapping_x11.h" #include <stdio.h> #include <stdlib.h> -#include <string.h> #include "print_string.h" #include "servers/physics/physics_server_sw.h" @@ -1673,7 +1672,7 @@ void OS_X11::close_joystick(int p_id) { }; void OS_X11::probe_joystick(int p_id) { - #if !defined(__FreeBSD__) && !defined(__OpenBSD__) + #ifndef __FreeBSD__ if (p_id == -1) { @@ -1728,7 +1727,7 @@ void OS_X11::move_window_to_foreground() { } void OS_X11::process_joysticks() { - #if !defined(__FreeBSD__) && !defined(__OpenBSD__) + #ifndef __FreeBSD__ int bytes; js_event events[32]; InputEvent ievent; @@ -1961,10 +1960,6 @@ OS_X11::OS_X11() { AudioDriverManagerSW::add_driver(&driver_alsa); #endif -#ifdef AO_ENABLED - AudioDriverManagerSW::add_driver(&driver_ao); -#endif - minimized = false; xim_style=0L; mouse_mode=MOUSE_MODE_VISIBLE; |