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 /* 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 /* 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