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

trunk/branch integration: compile fix

Browse Source
This commit is contained in:
Marian Krivos
2011-08-23 13:06:32 +00:00
parent 60050ce87a
commit 5950201733
4 changed files with 187 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
//
// Platform.h
//
// $Id: //poco/svn/Foundation/include/Poco/Platform.h#3 $
// $Id: //poco/1.4/Foundation/include/Poco/Platform.h#4 $
//
// Library: Foundation
// Package: Core
@@ -115,8 +115,11 @@
#define POCO_OS_FAMILY_UNIX 1
#define POCO_OS POCO_OS_CYGWIN
#elif defined(__VMS)
#define POCO_OS_FAMILY_VMS 1
#define POCO_OS POCO_OS_VMS
#define POCO_OS_FAMILY_VMS 1
#define POCO_OS POCO_OS_VMS
#elif defined(POCO_VXWORKS)
#define POCO_OS_FAMILY_UNIX 1
#define POCO_OS POCO_OS_VXWORKS
#endif
@@ -135,9 +138,12 @@
#define POCO_ARCH_ARM 0x0a
#define POCO_ARCH_M68K 0x0b
#define POCO_ARCH_S390 0x0c
#define POCO_ARCH_SH 0x0d
#define POCO_ARCH_NIOS2 0x0e
#if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA)
#define POCO_ARCH POCO_ARCH_ALPHA
#define POCO_ARCH POCO_ARCH_ALPHA
#define POCO_ARCH_LITTLE_ENDIAN 1
#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(_M_IX86)
#define POCO_ARCH POCO_ARCH_IA32
@@ -156,12 +162,12 @@
#define POCO_ARCH POCO_ARCH_MIPS
#define POCO_ARCH_BIG_ENDIAN 1
#elif defined(__hppa) || defined(__hppa__)
#define POCO_ARCH POCO_ARCH_HPPA
#define POCO_ARCH_BIG_ENDIAN 1
#define POCO_ARCH POCO_ARCH_HPPA
#define POCO_ARCH_BIG_ENDIAN 1
#elif defined(__PPC) || defined(__POWERPC__) || defined(__powerpc) || defined(__PPC__) || \
defined(__powerpc__) || defined(__ppc__) || defined(_ARCH_PPC) || defined(_M_PPC)
#define POCO_ARCH POCO_ARCH_PPC
#define POCO_ARCH_BIG_ENDIAN 1
defined(__powerpc__) || defined(__ppc__) || defined(__ppc) || defined(_ARCH_PPC) || defined(_M_PPC)
#define POCO_ARCH POCO_ARCH_PPC
#define POCO_ARCH_BIG_ENDIAN 1
#elif defined(_POWER) || defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_ARCH_PWR3) || \
defined(_ARCH_PWR4) || defined(__THW_RS6000)
#define POCO_ARCH POCO_ARCH_POWER
@@ -177,21 +183,36 @@
#define POCO_ARCH_LITTLE_ENDIAN 1
#endif
#elif defined(__m68k__)
#define POCO_ARCH POCO_ARCH_M68K
#define POCO_ARCH_BIG_ENDIAN 1
#define POCO_ARCH POCO_ARCH_M68K
#define POCO_ARCH_BIG_ENDIAN 1
#elif defined(__s390__)
#define POCO_ARCH POCO_ARCH_S390
#define POCO_ARCH_BIG_ENDIAN 1
#endif
#define POCO_ARCH POCO_ARCH_S390
#define POCO_ARCH_BIG_ENDIAN 1
#elif defined(__sh__) || defined(__sh)
#define POCO_ARCH POCO_ARCH_SH
#if defined(__LITTLE_ENDIAN__)
#define POCO_ARCH_LITTLE_ENDIAN 1
#else
#define POCO_ARCH_BIG_ENDIAN 1
#endif
//TODO: need to determine Linux > 2.6.0
#if (POCO_OS == POCO_OS_LINUX)
#define POCO_HAVE_FD_EPOLL 1
#endif
#define POCO_HAVE_FD_EPOLL 1
#endif
//TODO: determine all platforms having poll() call
#if (POCO_OS == POCO_OS_SOLARIS) || (POCO_OS == POCO_OS_LINUX)
#define POCO_HAVE_FD_POLL 1
#define POCO_HAVE_FD_POLL 1
#elif defined (nios2) || defined(__nios2) || defined(__nios2__)
#define POCO_ARCH POCO_ARCH_NIOS2
#if defined(__nios2_little_endian) || defined(nios2_little_endian) || defined(__nios2_little_endian__)
#define POCO_ARCH_LITTLE_ENDIAN 1
#else
#define POCO_ARCH_BIG_ENDIAN 1
#endif
#endif