summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2013-01-02 00:19:00 +1300
committerMatthew Parlane <parlane@gmail.com>2013-01-02 00:19:00 +1300
commit47681ea08d41e24923c8ace253427c93d2e9c649 (patch)
tree07e65b64055319d728990c6ff5d16b4c07eaae2f /Source/Core
parente0c9a1fd09b9be953bf0ae41b9014485e750b07e (diff)
Possibly fix build for mac.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
index e68ec87509..31f1a0aaef 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
@@ -62,7 +62,7 @@ it failed)
#define MALLOC(x) HeapAlloc(GetProcessHeap(), 0, (x))
#define FREE(x) HeapFree(GetProcessHeap(), 0, (x))
-#elif defined(__linux__)
+#elif defined(__linux__) or defined(__APPLE__)
#include <netdb.h>
#include <arpa/inet.h>
#include <sys/types.h>
@@ -598,12 +598,12 @@ static int inet_pton(const char *src, unsigned char *dst)
}
// Maps SOCKOPT level from native to Wii
-static int opt_level_mapping[][2] = {
+static unsigned int opt_level_mapping[][2] = {
{ SOL_SOCKET, 0xFFFF }
};
// Maps SOCKOPT optname from native to Wii
-static int opt_name_mapping[][2] = {
+static unsigned int opt_name_mapping[][2] = {
{ SO_REUSEADDR, 0x4 },
{ SO_SNDBUF, 0x1001 },
{ SO_RCVBUF, 0x1002 },
@@ -761,11 +761,11 @@ u32 CWII_IPC_HLE_Device_net_ip_top::ExecuteCommand(u32 _Command,
// Do the level/optname translation
int nat_level = -1, nat_optname = -1;
- for (int i = 0; i < sizeof (opt_level_mapping) / sizeof (opt_level_mapping[0]); ++i)
+ for (unsigned int i = 0; i < sizeof (opt_level_mapping) / sizeof (opt_level_mapping[0]); ++i)
if (level == opt_level_mapping[i][1])
nat_level = opt_level_mapping[i][0];
- for (int i = 0; i < sizeof (opt_name_mapping) / sizeof (opt_name_mapping[0]); ++i)
+ for (unsigned int i = 0; i < sizeof (opt_name_mapping) / sizeof (opt_name_mapping[0]); ++i)
if (optname == opt_name_mapping[i][1])
nat_optname = opt_name_mapping[i][0];