diff --git a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp b/Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp index be84a4f4ff..2392e59c85 100644 --- a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp +++ b/Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp @@ -47,7 +47,7 @@ bool CEXIETHERNET::activate() { return false; } struct ifreq ifr; -#if !defined(__APPLE__) + int err; memset(&ifr, 0, sizeof(ifr)); 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)); }*/ -#endif DEBUGPRINT("Returned Socket name is: %s\n", ifr.ifr_name); system("brctl addif pan0 Dolphin"); system("ifconfig Dolphin 0.0.0.0 promisc up"); diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index eab4c21aa2..16093e4a09 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -19,10 +19,6 @@ #include #include "svnrev.h" -#ifdef __APPLE__ -#include -#endif - #include "Common.h" // Common #if defined HAVE_X11 && HAVE_X11 @@ -316,15 +312,6 @@ bool DolphinApp::OnInit() } else if (!File::IsDirectory(AppSupportDir)) 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 #ifdef __linux__ diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp index 1d58e792f2..132e76c65c 100644 --- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp @@ -28,10 +28,6 @@ #include "Common.h" #include "FileUtil.h" -#ifdef __APPLE__ -#include -#endif - #if defined HAVE_X11 && HAVE_X11 #include #include "State.h"