From 6795551a8cb032eb7fbea4ad4afd4284b1c7eaad Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Thu, 22 Jul 2010 04:38:45 +0000
Subject: [PATCH] Linux build fix ... again.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5941 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Externals/WiiUseSrc/Src/io_nix.c              |  1 -
 Externals/WiiUseSrc/Src/wiiuse.h              | 28 -------------------
 .../Plugin_Wiimote/Src/wiimote_real.cpp       |  1 +
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/Externals/WiiUseSrc/Src/io_nix.c b/Externals/WiiUseSrc/Src/io_nix.c
index 129a611fcd..88caab3e2c 100644
--- a/Externals/WiiUseSrc/Src/io_nix.c
+++ b/Externals/WiiUseSrc/Src/io_nix.c
@@ -313,7 +313,6 @@ static int wiiuse_connect_single(struct wiimote_t* wm, char* address) {
 	WIIMOTE_ENABLE_STATE(wm, WIIMOTE_STATE_CONNECTED);
 	
 	wiiuse_set_report_type(wm);
-	wiiuse_handshake(wm, NULL, 0);
 
 	return 1;
 }
diff --git a/Externals/WiiUseSrc/Src/wiiuse.h b/Externals/WiiUseSrc/Src/wiiuse.h
index d6d2ed2542..6c4189adf5 100644
--- a/Externals/WiiUseSrc/Src/wiiuse.h
+++ b/Externals/WiiUseSrc/Src/wiiuse.h
@@ -249,34 +249,6 @@ typedef enum aspect_t {
 	WIIUSE_ASPECT_16_9
 } aspect_t;
 
-
-/**
- *	@struct ir_t
- *	@brief IR struct. Hold all data related to the IR tracking.
- */
-typedef struct ir_t {
-	struct ir_dot_t dot[4];			/**< IR dots							*/
-	byte num_dots;					/**< number of dots at this time		*/
-
-	enum aspect_t aspect;			/**< aspect ratio of the screen			*/
-
-	enum ir_position_t pos;			/**< IR sensor bar position				*/
-
-	unsigned int vres[2];			/**< IR virtual screen resolution		*/
-	int offset[2];					/**< IR XY correction offset			*/
-	int state;						/**< keeps track of the IR state		*/
-
-	int ax;							/**< absolute X coordinate				*/
-	int ay;							/**< absolute Y coordinate				*/
-
-	int x;							/**< calculated X coordinate			*/
-	int y;							/**< calculated Y coordinate			*/
-
-	float distance;					/**< pixel distance between first 2 dots*/
-	float z;						/**< calculated distance				*/
-} ir_t;
-
-
 /**
  *	@struct joystick_t
  *	@brief Joystick calibration structure.
diff --git a/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp
index 93eec82879..47586836aa 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp
@@ -525,6 +525,7 @@ void Shutdown(void)
 	// Clean up wiiuse
 #ifndef WIN32
 	wiiuse_cleanup(g_WiiMotesFromWiiUse, g_NumberOfWiiMotes);
+	g_WiiMotesFromWiiUse = NULL;
 #endif
 	// Uninitialized
 	g_RealWiiMoteInitialized = false;