# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1131212471 0
# Node ID 435c2e4812993c32fbee0227c40d62528a226ae9
# Parent  da33b7e6d181de9c3d4812c7080da87c752d5c59
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.

diff -r da33b7e6d181 -r 435c2e481299 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.