renamed SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H to SDL_HAVE_MACHINE_JO…

…YSTICK_H
libsdl-org · Feb 12, 2021 · 8e69f18 · 8e69f18
1 parent 2f8b1ff
commit 8e69f18
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/configure b/configure
@@ -21812,7 +21812,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
             if test x$have_machine_joystick = xyes; then
-                $as_echo "#define SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H 1" >>confdefs.h
+                $as_echo "#define SDL_HAVE_MACHINE_JOYSTICK_H 1" >>confdefs.h
 
             fi
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_machine_joystick" >&5

diff --git a/configure.ac b/configure.ac
@@ -2386,7 +2386,7 @@ CheckUSBHID()
             have_machine_joystick=yes
             ])
             if test x$have_machine_joystick = xyes; then
-                AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H)
+                AC_DEFINE(SDL_HAVE_MACHINE_JOYSTICK_H)
             fi
             AC_MSG_RESULT($have_machine_joystick)
 

diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
@@ -220,7 +220,7 @@
 #undef SDL_JOYSTICK_RISCOS
 #undef SDL_JOYSTICK_WINMM
 #undef SDL_JOYSTICK_USBHID
-#undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
+#undef SDL_HAVE_MACHINE_JOYSTICK_H
 
 /* Enable various shared object loading systems */
 #undef SDL_LOADSO_BEOS

diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c
@@ -69,7 +69,7 @@
 #include <sys/joystick.h>
 #endif
 
-#if SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
+#if SDL_HAVE_MACHINE_JOYSTICK_H
 #include <machine/joystick.h>
 #endif
 
@@ -407,7 +407,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy)
 	int nbutton, naxe = -1;
 	Sint32 v;
 
-#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__)
+#if defined(__FREEBSD__) || SDL_HAVE_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__)
 	struct joystick gameport;
 
 	if (joy->hwdata->type == BSDJOY_JOY) {
@@ -455,7 +455,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy)
 		}
 		return;
 	}
-#endif /* defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
+#endif /* defined(__FREEBSD__) || SDL_HAVE_MACHINE_JOYSTICK_H */
 
 	rep = &joy->hwdata->inreport;