rt/mergerfs
1
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-26 02:48:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

use standard platform macros. closes #43

Browse source
This commit is contained in:
Antonio SJ Musumeci 2015-02-02 21:30:31 -05:00
parent 805bc2d2e6
commit 1f90203025
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -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:

4
src/ugid.cpp
View file

@ -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

4
src/ugid.hpp
View file

@ -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"