Merge pull request #151 from TheROPFather/macExp

Working Mac build.
etternagame · Mar 10, 2018 · 2c8987c · 2c8987c
2 parents 4c81b2f + f03d20d
commit 2c8987c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/extern/LuaJIT/lua51Mac.a b/extern/LuaJIT/lua51Mac.a
diff --git a/extern/discord-rpc-2.0.1/lib/libdiscord-rpcMac.a b/extern/discord-rpc-2.0.1/lib/libdiscord-rpcMac.a
diff --git a/src/StageStats.cpp b/src/StageStats.cpp
@@ -95,7 +95,7 @@ string getMachineName()
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-#ifdef DARWIN
+#ifdef __APPLE__
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if_dl.h>
@@ -128,7 +128,7 @@ void getMacHash(uint16_t& mac1, uint16_t& mac2)
 	mac1 = 0;
 	mac2 = 0;
 
-#ifdef DARWIN
+#ifdef __APPLE__
 
 	struct ifaddrs* ifaphead;
 	if (getifaddrs(&ifaphead) != 0)
@@ -145,12 +145,10 @@ void getMacHash(uint16_t& mac1, uint16_t& mac2)
 			if (!foundMac1)
 			{
 				foundMac1 = true;
-				mac1 = hashMacAddress((uint8_t*)(LLADDR(sdl))); //sdl->sdl_data) + 
-				sdl->sdl_nlen) );
+				mac1 = hashMacAddress((uint8_t*)(LLADDR(sdl)));
 			}
 			else {
-				mac2 = hashMacAddress((uint8_t*)(LLADDR(sdl))); //sdl->sdl_data) + 
-				sdl->sdl_nlen) );
+				mac2 = hashMacAddress((uint8_t*)(LLADDR(sdl))); 
 				break;
 			}
 		}

diff --git a/src/archutils/Darwin/StepMania.pch → src/archutils/Darwin/Etterna.pch b/src/archutils/Darwin/StepMania.pch → src/archutils/Darwin/Etterna.pch