From 6f7b528206b423eb02d063bac75ee4141f0a4728 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sat, 1 Jan 2011 19:50:50 -0800
Subject: [PATCH] I am using SDL 1.3 on FreeBSD. I found two problems.

(1) SDL_atomic dummy version in SDL 1.3 is not used.
Because src/atomic/dummy/*.c are not used.

(2) Typo in src/joystick/bsd/SDL_sysjoystick.c.

Thanks,
IWATSUKI Hiroyuki
---
 configure.in                       | 6 ++++++
 src/joystick/bsd/SDL_sysjoystick.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index a646cf2e6..af9165771 100644
--- a/configure.in
+++ b/configure.in
@@ -2826,6 +2826,12 @@ if test x$have_loadso != xyes; then
     fi
     SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c"
 fi
+if test x$have_atomic != xyes; then
+    if test x$enable_atomic = xyes; then
+        AC_DEFINE(SDL_ATOMIC_DISABLED)
+    fi
+    SOURCES="$SOURCES $srcdir/src/atomic/dummy/*.c"
+fi
 if test x$SDLMAIN_SOURCES = x; then
     SDLMAIN_SOURCES="$srcdir/src/main/dummy/*.c"
 fi
diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c
index 5fd15cad3..dc23073e9 100644
--- a/src/joystick/bsd/SDL_sysjoystick.c
+++ b/src/joystick/bsd/SDL_sysjoystick.c
@@ -59,7 +59,7 @@
 #include <libusbhid.h>
 #endif
 
-#ifdef defined(__FREEBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FREEBSD__) || defined(__FreeBSD_kernel__)
 #ifndef __DragonFly__
 #include <osreldate.h>
 #endif