Merge pull request #44 from trapexit/platformdefines

use standard platform macros. closes #43
10 years ago · 1f61a662ad
3 changed files with 4 additions and 12 deletions
--- a/8
+++ b/8
@ -91,14 +91,6 @@ $(warning "xattr not available: disabling")
 CFLAGS += -DWITHOUT_XATTR
 endif

-KERNEL = $(shell uname -s)
-ifeq ($(KERNEL),Linux)
-	CFLAGS += -DLINUX
-endif
-ifeq ($(KERNEL),Darwin)
-	CFLAGS += -DOSX
-endif
-
 all: $(TARGET) clonepath

 help:
--- a/src/ugid.cpp
+++ b/src/ugid.cpp
@ -24,8 +24,8 @@

 #include "ugid.hpp"

-#if defined LINUX
-#elif defined OSX
+#if defined __linux__
+#elif defined __APPLE__
 #else
 pthread_mutex_t mergerfs::ugid::SetResetGuard::lock = PTHREAD_MUTEX_INITIALIZER;
 #endif
--- a/src/ugid.hpp
+++ b/src/ugid.hpp
@ -25,9 +25,9 @@
 #ifndef __UGID_HPP__
 #define __UGID_HPP__

-#if defined LINUX
+#if defined __linux__
 #include "ugid_linux.hpp"
-#elif defined OSX
+#elif defined __APPLE__
 #include "ugid_osx.hpp"
 #else
 #include "ugid_mutex.hpp"