Commit 7a05dbf4b955e40f5163e16e2ee2a9f3acfb88a4
2020-11-24T06:42:53
Fixed building on FreeBSD Alex S Looks like we have a collision with https://hg.libsdl.org/SDL/rev/cd774daff9f6. (Again, the headers in the base system are intended for drivers and should not be used for compiling non-base applications. At least that's the policy for now: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240964#c19.)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
diff --git a/configure b/configure
index d55e0c2..47e701c 100755
--- a/configure
+++ b/configure
@@ -22712,35 +22712,9 @@ $as_echo "#define SDL_VIDEO_VULKAN 1" >>confdefs.h
CheckInputEvents()
{
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux 2.4 unified input interface" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux 2.4 unified input interface" >&5
$as_echo_n "checking for Linux 2.4 unified input interface... " >&6; }
- use_input_events=no
-
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <dev/evdev/input.h>
-
-int
-main ()
-{
-
- #ifndef EVIOCGNAME
- #error EVIOCGNAME() ioctl not available
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
- use_input_events=yes
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test x$use_input_events = xno; then
+ use_input_events=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -22764,16 +22738,14 @@ if ac_fn_c_try_compile "$LINENO"; then :
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_input_events" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_input_events" >&5
$as_echo "$use_input_events" >&6; }
- if test x$use_input_events = xyes; then
+ if test x$use_input_events = xyes; then
$as_echo "#define SDL_INPUT_LINUXEV 1" >>confdefs.h
- SUMMARY_input="${SUMMARY_input} linuxev"
- fi
+ SUMMARY_input="${SUMMARY_input} linuxev"
+ fi
}
CheckInputKD()
diff --git a/configure.ac b/configure.ac
index d5e8757..af0c71a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2603,22 +2603,8 @@ dnl See if we can use the new unified event interface in Linux 2.4
CheckInputEvents()
{
dnl Check for Linux 2.4 unified input event interface support
- AC_MSG_CHECKING(for Linux 2.4 unified input interface)
- use_input_events=no
-
- dnl FreeBSD puts this in /usr/include/dev/evdev/input.h ...
- AC_TRY_COMPILE([
- #include <dev/evdev/input.h>
- ],[
- #ifndef EVIOCGNAME
- #error EVIOCGNAME() ioctl not available
- #endif
- ],[
- use_input_events=yes
- ])
-
- dnl And Linux of course puts it in linux/input.h ...
- if test x$use_input_events = xno; then
+ AC_MSG_CHECKING(for Linux 2.4 unified input interface)
+ use_input_events=no
AC_TRY_COMPILE([
#include <linux/input.h>
],[
@@ -2628,13 +2614,11 @@ CheckInputEvents()
],[
use_input_events=yes
])
- fi
-
- AC_MSG_RESULT($use_input_events)
- if test x$use_input_events = xyes; then
- AC_DEFINE(SDL_INPUT_LINUXEV, 1, [ ])
- SUMMARY_input="${SUMMARY_input} linuxev"
- fi
+ AC_MSG_RESULT($use_input_events)
+ if test x$use_input_events = xyes; then
+ AC_DEFINE(SDL_INPUT_LINUXEV, 1, [ ])
+ SUMMARY_input="${SUMMARY_input} linuxev"
+ fi
}
dnl See if we can use the kernel kd.h header
diff --git a/src/joystick/linux/SDL_sysjoystick_c.h b/src/joystick/linux/SDL_sysjoystick_c.h
index 897c925..bcbc255 100644
--- a/src/joystick/linux/SDL_sysjoystick_c.h
+++ b/src/joystick/linux/SDL_sysjoystick_c.h
@@ -22,11 +22,7 @@
#ifndef SDL_sysjoystick_c_h_
#define SDL_sysjoystick_c_h_
-#ifdef __linux__
#include <linux/input.h>
-#else /* FreeBSD (and maybe others) */
-#include <dev/evdev/input.h>
-#endif
struct SDL_joylist_item;