From 7c0cae9e8bf44f5a1556530d7e64f74d41d6f60f Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Wed, 13 Oct 2010 13:18:17 +0000
Subject: [PATCH] Get the htonl/htons prototypes on all Unix-likes.

Clean up a few remnants of the --wiimote_plugin command-line option.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6277 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Externals/WiiUse/Src/definitions.h     | 3 ++-
 Externals/WiiUse/Src/wiiuse_internal.h | 4 ----
 Source/Core/DolphinWX/Src/Main.cpp     | 4 ----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Externals/WiiUse/Src/definitions.h b/Externals/WiiUse/Src/definitions.h
index 77e98a2b2a..942d493e61 100644
--- a/Externals/WiiUse/Src/definitions.h
+++ b/Externals/WiiUse/Src/definitions.h
@@ -35,6 +35,7 @@
 #define DEFINITIONS_H_INCLUDED
 
 #ifndef _WIN32
+#include <arpa/inet.h>					/* htons() */
 #include "Log.h"
 
 // NOTICE_LEVEL is more appropriate for the uses of WIIUSE_INFO than INFO_LEVEL
@@ -68,7 +69,7 @@ char* file = __FILE__;																			\
 #define WIIUSE_DEBUG(fmt, ...)			
 #endif
 
-#endif
+#endif // _WIN32
 
 /* Convert to big endian */
 #define BIG_ENDIAN_LONG(i)				(htonl(i))
diff --git a/Externals/WiiUse/Src/wiiuse_internal.h b/Externals/WiiUse/Src/wiiuse_internal.h
index fca3a5a6c2..2308632cc3 100644
--- a/Externals/WiiUse/Src/wiiuse_internal.h
+++ b/Externals/WiiUse/Src/wiiuse_internal.h
@@ -44,10 +44,6 @@
 #ifndef WIIUSE_INTERNAL_H_INCLUDED
 #define WIIUSE_INTERNAL_H_INCLUDED
 
-#ifdef __linux__
-	#include <arpa/inet.h>				/* htons() */
-#endif
-
 /* wiiuse version */
 #define WIIUSE_VERSION					"0.12"
 
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 00c7b8d5da..3ae68bb9d3 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -95,11 +95,9 @@ bool DolphinApp::OnInit()
 	bool UseLogger = false;
 	bool selectVideoPlugin = false;
 	bool selectAudioPlugin = false;
-	bool selectWiimotePlugin = false;
 
 	wxString videoPluginFilename;
 	wxString audioPluginFilename;
-	wxString wiimotePluginFilename;
 
 #if wxUSE_CMDLINE_PARSER // Parse command lines
 #if wxCHECK_VERSION(2, 9, 0)
@@ -190,11 +188,9 @@ bool DolphinApp::OnInit()
 #if wxCHECK_VERSION(2, 9, 0)
 	selectVideoPlugin = parser.Found("video_plugin", &videoPluginFilename);
 	selectAudioPlugin = parser.Found("audio_plugin", &audioPluginFilename);
-	selectWiimotePlugin = parser.Found("wiimote_plugin", &wiimotePluginFilename);
 #else
 	selectVideoPlugin = parser.Found(wxT("video_plugin"), &videoPluginFilename);
 	selectAudioPlugin = parser.Found(wxT("audio_plugin"), &audioPluginFilename);
-	selectWiimotePlugin = parser.Found(wxT("wiimote_plugin"), &wiimotePluginFilename);
 #endif
 #endif // wxUSE_CMDLINE_PARSER