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

Remove a few __APPLE__ ifdefs which are no longer necessary. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5569 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-06-02 15:54:35 +00:00
parent 9c1b4dee44
commit d5e2bbf7cd
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp
View File

@ -47,7 +47,7 @@ bool CEXIETHERNET::activate() {
return false; return false;
} }
struct ifreq ifr; struct ifreq ifr;
#if !defined(__APPLE__)
int err; int err;
memset(&ifr, 0, sizeof(ifr)); memset(&ifr, 0, sizeof(ifr));
ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE; ifr.ifr_flags = IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE;
@ -73,7 +73,6 @@ bool CEXIETHERNET::activate() {
DEBUGPRINT("set tun device flags: %s", strerror (errno)); DEBUGPRINT("set tun device flags: %s", strerror (errno));
}*/ }*/
#endif
DEBUGPRINT("Returned Socket name is: %s\n", ifr.ifr_name); DEBUGPRINT("Returned Socket name is: %s\n", ifr.ifr_name);
system("brctl addif pan0 Dolphin"); system("brctl addif pan0 Dolphin");
system("ifconfig Dolphin 0.0.0.0 promisc up"); system("ifconfig Dolphin 0.0.0.0 promisc up");

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

@ -19,10 +19,6 @@
#include <string> #include <string>
#include "svnrev.h" #include "svnrev.h"
#ifdef __APPLE__
#include <sys/param.h>
#endif
#include "Common.h" // Common #include "Common.h" // Common
#if defined HAVE_X11 && HAVE_X11 #if defined HAVE_X11 && HAVE_X11
@ -316,15 +312,6 @@ bool DolphinApp::OnInit()
} }
else if (!File::IsDirectory(AppSupportDir)) else if (!File::IsDirectory(AppSupportDir))
PanicAlert("~/Library/Application Support/Dolphin exists, but is not a directory"); PanicAlert("~/Library/Application Support/Dolphin exists, but is not a directory");
#if !wxCHECK_VERSION(2, 9, 0)
// HACK: Get rid of bogus osx param
if (argc > 1 && wxString(argv[argc - 1]).StartsWith(_("-psn_"))) {
delete argv[argc-1];
argv[argc-1] = NULL;
argc--;
}
#endif
#endif #endif
#ifdef __linux__ #ifdef __linux__

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

@ -28,10 +28,6 @@
#include "Common.h" #include "Common.h"
#include "FileUtil.h" #include "FileUtil.h"
#ifdef __APPLE__
#include <sys/param.h>
#endif
#if defined HAVE_X11 && HAVE_X11 #if defined HAVE_X11 && HAVE_X11
#include <X11/keysym.h> #include <X11/keysym.h>
#include "State.h" #include "State.h"