From 04596c5cbc0888af00daa08f28d99ca3c543a541 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 5 Nov 2005 17:41:11 +0000 Subject: [PATCH] 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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/joystick/dummy/SDL_sysjoystick.c b/src/joystick/dummy/SDL_sysjoystick.c index 5f7d104b1..2c1eeffb1 100644 --- a/src/joystick/dummy/SDL_sysjoystick.c +++ b/src/joystick/dummy/SDL_sysjoystick.c @@ -34,8 +34,6 @@ static char rcsid = #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.