ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Soren Jorvang 2010-10-13 13:18:17 +00:00
parent 77a3a5078e
commit 7c0cae9e8b
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Externals/WiiUse/Src/definitions.h vendored
View File

@ -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))

4
Externals/WiiUse/Src/wiiuse_internal.h vendored
View File

@ -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"

4
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -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