diff --git a/Makefile b/Makefile index f5219e07..681616fa 100644 --- a/Makefile +++ b/Makefile @@ -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: diff --git a/src/ugid.cpp b/src/ugid.cpp index 3d8b47f8..3f093739 100644 --- 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 diff --git a/src/ugid.hpp b/src/ugid.hpp index 78b861f6..ffb42fe5 100644 --- 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"