summaryrefslogtreecommitdiffstats
path: root/src/OSSupport
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-04-02 16:51:48 +0200
committerTycho <work.tycho+git@gmail.com>2014-04-02 16:51:48 +0200
commit0075b2f72eb18f9283ae02b7b9a69bdb52d2bd46 (patch)
treeedf3601fa8b13bfd93be14df2ba0fb112d2cad3d /src/OSSupport
parentMerge branch 'master' into HTTPSizeT (diff)
parentFixed boat placement code. (diff)
downloadcuberite-0075b2f72eb18f9283ae02b7b9a69bdb52d2bd46.tar
cuberite-0075b2f72eb18f9283ae02b7b9a69bdb52d2bd46.tar.gz
cuberite-0075b2f72eb18f9283ae02b7b9a69bdb52d2bd46.tar.bz2
cuberite-0075b2f72eb18f9283ae02b7b9a69bdb52d2bd46.tar.lz
cuberite-0075b2f72eb18f9283ae02b7b9a69bdb52d2bd46.tar.xz
cuberite-0075b2f72eb18f9283ae02b7b9a69bdb52d2bd46.tar.zst
cuberite-0075b2f72eb18f9283ae02b7b9a69bdb52d2bd46.zip
Diffstat (limited to '')
-rw-r--r--src/OSSupport/Errors.cpp2
-rw-r--r--src/OSSupport/Sleep.h2
-rw-r--r--src/OSSupport/Thread.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/OSSupport/Errors.cpp b/src/OSSupport/Errors.cpp
index 2e05f1df1..6072b6ac6 100644
--- a/src/OSSupport/Errors.cpp
+++ b/src/OSSupport/Errors.cpp
@@ -22,7 +22,7 @@ AString GetOSErrorString( int a_ErrNo )
// According to http://linux.die.net/man/3/strerror_r there are two versions of strerror_r():
- #if ( _GNU_SOURCE ) && !defined(ANDROID_NDK) // GNU version of strerror_r()
+ #if !defined(__APPLE__) && ( _GNU_SOURCE ) && !defined(ANDROID_NDK) // GNU version of strerror_r()
char * res = strerror_r( errno, buffer, ARRAYCOUNT(buffer) );
if( res != NULL )
diff --git a/src/OSSupport/Sleep.h b/src/OSSupport/Sleep.h
index 5298c15da..0ec0adf9d 100644
--- a/src/OSSupport/Sleep.h
+++ b/src/OSSupport/Sleep.h
@@ -4,4 +4,4 @@ class cSleep
{
public:
static void MilliSleep( unsigned int a_MilliSeconds );
-}; \ No newline at end of file
+};
diff --git a/src/OSSupport/Thread.h b/src/OSSupport/Thread.h
index 3c9316424..4153b2427 100644
--- a/src/OSSupport/Thread.h
+++ b/src/OSSupport/Thread.h
@@ -23,4 +23,4 @@ private:
cEvent* m_StopEvent;
AString m_ThreadName;
-}; \ No newline at end of file
+};