diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-02 15:54:35 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-02 15:54:35 +0000 |
| commit | d5e2bbf7cde4ab41ea3e8b330fb979f117d22d97 (patch) | |
| tree | cbd44706b80e570c4afba1e5527792cad11b1915 | |
| parent | 9c1b4dee4497e20634e3e7416ba1989bef055014 (diff) | |
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
| -rw-r--r-- | Source/Core/Core/Src/HW/BBA-TAP/TAP_Unix.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.cpp | 13 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/MainNoGUI.cpp | 4 |
3 files changed, 1 insertions, 19 deletions
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 <string> #include "svnrev.h" -#ifdef __APPLE__ -#include <sys/param.h> -#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 <sys/param.h> -#endif - #if defined HAVE_X11 && HAVE_X11 #include <X11/keysym.h> #include "State.h" |