Date: Sat, 05 Nov 2005 17:46:48 +0900
authorSam Lantinga <slouken@libsdl.org>
Sat, 05 Nov 2005 17:41:11 +0000
changeset 1167 435c2e481299
parent 1166 da33b7e6d181
child 1168 045f186426e1
Date: Sat, 05 Nov 2005 17:46:48 +0900 From: Hayashi Naoyuki Subject: SDL_numjoysticks: multiply defined The following linker error is produced when I try to build SDL CVS on Tru64. ld: .libs/libSDL.lax/libjoystick.a/SDL_sysjoystick.o: SDL_numjoysticks: multiply defined SDL_numjoysticks is defined in both src/joystick/SDL_joystick.c:48: and SDL12/src/joystick/dummy/SDL_sysjoystick.c:37:. As a result, compilation produce "multiply defined" errors, when link.
src/joystick/dummy/SDL_sysjoystick.c
--- a/src/joystick/dummy/SDL_sysjoystick.c	Tue Nov 01 23:19:59 2005 +0000
+++ b/src/joystick/dummy/SDL_sysjoystick.c	Sat Nov 05 17:41:11 2005 +0000
@@ -34,8 +34,6 @@
 #include "SDL_sysjoystick.h"
 #include "SDL_joystick_c.h"
 
-Uint8 SDL_numjoysticks = 0;
-
 /* Function to scan the system for joysticks.
  * This function should set SDL_numjoysticks to the number of available
  * joysticks.  Joystick 0 should be the system default joystick.