From 523e64d30bdb68a904a9f1aebe2ff6b7985f8b86 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Thu, 20 Nov 2014 00:16:00 +0300 Subject: Include string.h for memset() on OpenBSD --- platform/x11/os_x11.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'platform/x11/os_x11.cpp') diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 74ebad748a..189f0f3acb 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -32,6 +32,7 @@ #include "key_mapping_x11.h" #include #include +#include #include "print_string.h" #include "servers/physics/physics_server_sw.h" #include "errno.h" -- cgit v1.2.3 From b14c90801f99fe97cb445a56036eefeedfe720db Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Thu, 20 Nov 2014 00:20:27 +0300 Subject: Disable X11 joystick functions also for OpenBSD --- platform/x11/os_x11.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'platform/x11/os_x11.cpp') diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 189f0f3acb..4f1b475d06 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1673,7 +1673,7 @@ void OS_X11::close_joystick(int p_id) { }; void OS_X11::probe_joystick(int p_id) { - #ifndef __FreeBSD__ + #if !defined(__FreeBSD__) && !defined(__OpenBSD__) if (p_id == -1) { @@ -1728,7 +1728,7 @@ void OS_X11::move_window_to_foreground() { } void OS_X11::process_joysticks() { - #ifndef __FreeBSD__ + #if !defined(__FreeBSD__) && !defined(__OpenBSD__) int bytes; js_event events[32]; InputEvent ievent; -- cgit v1.2.3