generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-17 11:05:03 +02:00
Code Issues Projects Releases Wiki Activity

Moved GCC ifdefs to Platform_POSIX

Browse Source 
Moved GCC ifdefs added for Android fron SocketDefs.h to Platform_POSIX.h
This commit is contained in:
aleks-f
2012-12-02 22:37:02 -06:00
parent 6d2881ef34
commit 401415773f
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Foundation/include/Poco/Platform.h
View File

@@ -201,8 +201,8 @@
#define POCO_ARCH_BIG_ENDIAN 1 #define POCO_ARCH_BIG_ENDIAN 1
#endif #endif
#elif defined (nios2) || defined(__nios2) || defined(__nios2__) #elif defined (nios2) || defined(__nios2) || defined(__nios2__)
#define POCO_ARCH POCO_ARCH_NIOS2 #define POCO_ARCH POCO_ARCH_NIOS2
#if defined(__nios2_little_endian) || defined(nios2_little_endian) || defined(__nios2_little_endian__) #if defined(__nios2_little_endian) || defined(nios2_little_endian) || defined(__nios2_little_endian__)
#define POCO_ARCH_LITTLE_ENDIAN 1 #define POCO_ARCH_LITTLE_ENDIAN 1
#else #else
#define POCO_ARCH_BIG_ENDIAN 1 #define POCO_ARCH_BIG_ENDIAN 1
@@ -216,14 +216,4 @@
#endif #endif
//
// Thread-safety of local static initialization
//
#if __cplusplus >= 201103L || __GNUC__ >= 4 || defined(__clang__)
#ifndef POCO_LOCAL_STATIC_INIT_IS_THREADSAFE
#define POCO_LOCAL_STATIC_INIT_IS_THREADSAFE 1
#endif
#endif
#endif // Foundation_Platform_INCLUDED #endif // Foundation_Platform_INCLUDED

24
Foundation/include/Poco/Platform_POSIX.h
View File

@@ -54,4 +54,28 @@
#endif #endif
//
// Thread-safety of local static initialization
//
#if __cplusplus >= 201103L || __GNUC__ >= 4 || defined(__clang__)
#ifndef POCO_LOCAL_STATIC_INIT_IS_THREADSAFE
#define POCO_LOCAL_STATIC_INIT_IS_THREADSAFE 1
#endif
#endif
#ifdef __GNUC__
#ifndef __THROW
#ifndef __GNUC_PREREQ
#define __GNUC_PREREQ(maj, min) (0)
#endif
#if defined __cplusplus && __GNUC_PREREQ (2,8)
#define __THROW throw ()
#else
#define __THROW
#endif
#endif
#endif // __GNUC__
#endif // Foundation_Platform_POSIX_INCLUDED #endif // Foundation_Platform_POSIX_INCLUDED

10
Net/include/Poco/Net/SocketDefs.h
View File

@@ -39,16 +39,6 @@
#ifndef Net_SocketDefs_INCLUDED #ifndef Net_SocketDefs_INCLUDED
#define Net_SocketDefs_INCLUDED #define Net_SocketDefs_INCLUDED
#ifndef __THROW
# ifndef __GNUC_PREREQ
# define __GNUC_PREREQ(maj, min) (0)
# endif
# if defined __cplusplus && __GNUC_PREREQ (2,8)
# define __THROW throw ()
# else
# define __THROW
# endif
#endif
#if defined(POCO_OS_FAMILY_WINDOWS) #if defined(POCO_OS_FAMILY_WINDOWS)
#include "Poco/UnWindows.h" #include "Poco/UnWindows.h"