changeset 4944:921637675f2c

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
author Sam Lantinga <slouken@libsdl.org>
date Sat, 01 Jan 2011 19:50:50 -0800
parents f65299ded39c
children 04c8581b729e
files configure.in src/joystick/bsd/SDL_sysjoystick.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Sat Jan 01 19:46:36 2011 -0800
+++ b/configure.in	Sat Jan 01 19:50:50 2011 -0800
@@ -2826,6 +2826,12 @@
     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
--- a/src/joystick/bsd/SDL_sysjoystick.c	Sat Jan 01 19:46:36 2011 -0800
+++ b/src/joystick/bsd/SDL_sysjoystick.c	Sat Jan 01 19:50:50 2011 -0800
@@ -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