generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +01:00
Code Issues Projects Releases Wiki Activity

more fixes related to GH #1453

Browse Source 
Conflicts:
	Foundation/include/Poco/AtomicCounter.h
This commit is contained in:
Guenter Obiltschnig
2016-12-06 21:47:39 +01:00
parent 710845f023
commit feedbbbea5
6 changed files with 61 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Foundation/include/Poco/AtomicCounter.h
View File

@@ -24,7 +24,17 @@
#if POCO_OS == POCO_OS_WINDOWS_NT
#include "Poco/UnWindows.h"
#elif POCO_OS == POCO_OS_MAC_OS_X
<<<<<<< HEAD
#include <libkern/OSAtomic.h>
=======
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_12 || __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 || __TV_OS_VERSION_MAX_ALLOWED >= __TVOS_10_0 || __WATCH_OS_VERSION_MAX_ALLOWED >= __WATCHOS_3_0
#ifndef POCO_HAVE_STD_ATOMICS
#define POCO_HAVE_STD_ATOMICS
#endif
#else
#include <libkern/OSAtomic.h>
#endif
>>>>>>> c8aa273... more fixes related to GH #1453
#elif ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2) || __GNUC__ > 4) && (defined(__x86_64__) || defined(__i386__))
#if !defined(POCO_HAVE_GCC_ATOMICS) && !defined(POCO_NO_GCC_ATOMICS)
#define POCO_HAVE_GCC_ATOMICS