Merge ed9dabe088 into 1cc1536e6a

contrib/ports/unix/port/netif/sio.c

@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#if defined(LWIP_UNIX_OPENBSD) || defined(LWIP_UNIX_MACH)
+#if defined(LWIP_UNIX_OPENBSD)
 #include <util.h>
 #endif
 #include <termios.h>

src/apps/http/makefsdata/makefsdata.c

@@ -77,7 +77,7 @@ static int deflate_level; /* default compression level, can be changed via comma
 #define CHDIR(path)                   SetCurrentDirectoryA(path)
 #define CHDIR_SUCCEEDED(ret)          (ret == TRUE)
 
-#elif __linux__ || __APPLE__
+#elif __linux__
 
 #define GETCWD(path, len)             getcwd(path, len)
 #define GETCWD_SUCCEEDED(ret)         (ret != NULL)