diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-04-30 17:30:23 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-04-30 17:30:23 +0000 |
| commit | ba07e299591d9d8c58b36c51e3bcaf19f4937d1c (patch) | |
| tree | d978d02d2859ae7d7d40d2333b81579a5100f2fe | |
| parent | 8f4760f520d70cb9a5f20da1790ee3e619cb847f (diff) | |
| download | ATCD-ba07e299591d9d8c58b36c51e3bcaf19f4937d1c.tar.gz | |
Added a macro ACE_LACKS_INLINE_FUNCTIONS
| -rw-r--r-- | ace/OS.h | 2936 |
1 files changed, 1475 insertions, 1461 deletions
@@ -23,9 +23,13 @@ #include "ace/inc_user_config.h" #if defined (ACE_HAS_MOSTLY_UNICODE_APIS) && !defined (UNICODE) -#error UNICODE must be defined when using ACE_HAS_MOSTLY_UNICODE_APIS, check your compiler document on how to enable UNICODE. +# error UNICODE must be defined when using ACE_HAS_MOSTLY_UNICODE_APIS, check your compiler document on how to enable UNICODE. #endif /* ACE_HAS_MOSTLY_UNICODE_APIS && !UNICODE */ +#if defined (ACE_LACKS_INLINE_FUNCTIONS) +# define ACE_NO_INLINE +#endif + #if defined (ACE_HAS_ANSI_CASTS) # define ACE_static_cast(TYPE, EXPR) static_cast<TYPE> (EXPR) # define ACE_const_cast(TYPE, EXPR) const_cast<TYPE> (EXPR) @@ -51,15 +55,15 @@ // Deal with MSVC++ insanity for CORBA... #if defined (ACE_HAS_BROKEN_NAMESPACES) -#define ACE_CORBA_1(NAME) CORBA_##NAME -#define ACE_CORBA_2(TYPE, NAME) CORBA_##TYPE##_##NAME -#define ACE_CORBA_3(TYPE, NAME) CORBA_##TYPE::NAME -#define ACE_NESTED_CLASS(TYPE, NAME) NAME +# define ACE_CORBA_1(NAME) CORBA_##NAME +# define ACE_CORBA_2(TYPE, NAME) CORBA_##TYPE##_##NAME +# define ACE_CORBA_3(TYPE, NAME) CORBA_##TYPE::NAME +# define ACE_NESTED_CLASS(TYPE, NAME) NAME #else /* ! ACE_HAS_BROKEN_NAMESPACES */ -#define ACE_CORBA_1(NAME) CORBA::NAME -#define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME -#define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME -#define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME +# define ACE_CORBA_1(NAME) CORBA::NAME +# define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME +# define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME +# define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME #endif /* ! ACE_HAS_BROKEN_NAMESPACES */ // Define some helpful macros. @@ -74,17 +78,17 @@ #endif /* ! ACE_NO_INLINE */ #if !defined (ACE_DEFAULT_CLOSE_ALL_HANDLES) -#define ACE_DEFAULT_CLOSE_ALL_HANDLES 1 +# define ACE_DEFAULT_CLOSE_ALL_HANDLES 1 #endif /* ACE_DEFAULT_CLOSE_ALL_HANDLES */ // The maximum length for a fully qualified Internet name. #if !defined(ACE_MAX_FULLY_QUALIFIED_NAME_LEN) -#define ACE_MAX_FULLY_QUALIFIED_NAME_LEN 256 +# define ACE_MAX_FULLY_QUALIFIED_NAME_LEN 256 #endif /* ACE_MAX_FULLY_QUALIFIED_NAME_LEN */ #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG) // control message size to pass a file descriptor -#define ACE_BSD_CONTROL_MSG_LEN sizeof (struct cmsghdr) + sizeof (ACE_HANDLE) +# define ACE_BSD_CONTROL_MSG_LEN sizeof (struct cmsghdr) + sizeof (ACE_HANDLE) #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */ // Define the default constants for ACE. Many of these are used for @@ -92,208 +96,208 @@ // defining the macros in your config.h file. #if !defined (ACE_DEFAULT_TIMEOUT) -#define ACE_DEFAULT_TIMEOUT 5 +# define ACE_DEFAULT_TIMEOUT 5 #endif /* ACE_DEFAULT_TIMEOUT */ #if !defined (ACE_DEFAULT_THREADS) -#define ACE_DEFAULT_THREADS 1 +# define ACE_DEFAULT_THREADS 1 #endif /* ACE_DEFAULT_THREADS */ // The following 3 defines are used in the IP multicast and broadcast tests. #if !defined (ACE_DEFAULT_BROADCAST_PORT) -#define ACE_DEFAULT_BROADCAST_PORT 10000 +# define ACE_DEFAULT_BROADCAST_PORT 10000 #endif /* ACE_DEFAULT_BROADCAST_PORT */ #if !defined (ACE_DEFAULT_MULTICAST_PORT) -#define ACE_DEFAULT_MULTICAST_PORT 10001 +# define ACE_DEFAULT_MULTICAST_PORT 10001 #endif /* ACE_DEFAULT_MULTICAST_PORT */ #if !defined (ACE_DEFAULT_MULTICAST_ADDR) -#define ACE_DEFAULT_MULTICAST_ADDR "224.9.9.2" +# define ACE_DEFAULT_MULTICAST_ADDR "224.9.9.2" #endif /* ACE_DEFAULT_MULTICAST_ADDR */ // Default port number for HTTP. #if !defined (ACE_DEFAULT_HTTP_SERVER_PORT) -#define ACE_DEFAULT_HTTP_SERVER_PORT 80 +# define ACE_DEFAULT_HTTP_SERVER_PORT 80 #endif /* ACE_DEFAULT_HTTP_SERVER_PORT */ // Used in many IPC_SAP tests #if !defined (ACE_DEFAULT_SERVER_PORT) -#define ACE_DEFAULT_SERVER_PORT 10002 +# define ACE_DEFAULT_SERVER_PORT 10002 #endif /* ACE_DEFAULT_SERVER_PORT */ #if !defined (ACE_DEFAULT_MAX_SOCKET_BUFSIZ) -#define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65536 +# define ACE_DEFAULT_MAX_SOCKET_BUFSIZ 65536 #endif /* ACE_DEFAULT_MAX_SOCKET_BUFSIZ */ #if !defined (ACE_DEFAULT_SERVER_PORT_STR) -#define ACE_DEFAULT_SERVER_PORT_STR "10002" +# define ACE_DEFAULT_SERVER_PORT_STR "10002" #endif /* ACE_DEFAULT_SERVER_PORT_STR */ // Used for the Service_Directory test #if !defined (ACE_DEFAULT_SERVICE_PORT) -#define ACE_DEFAULT_SERVICE_PORT 10003 +# define ACE_DEFAULT_SERVICE_PORT 10003 #endif /* ACE_DEFAULT_SERVICE_PORT */ // Used for the ACE_Thread_Spawn test #if !defined (ACE_DEFAULT_THR_PORT ) -#define ACE_DEFAULT_THR_PORT 10004 +# define ACE_DEFAULT_THR_PORT 10004 #endif /* ACE_DEFAULT_THR_PORT */ // Used for SOCK_Connect::connect() tests #if !defined (ACE_DEFAULT_LOCAL_PORT) -#define ACE_DEFAULT_LOCAL_PORT 10005 +# define ACE_DEFAULT_LOCAL_PORT 10005 #endif /* ACE_DEFAULT_LOCAL_PORT */ // Used for Connector tests #if !defined (ACE_DEFAULT_LOCAL_PORT_STR) -#define ACE_DEFAULT_LOCAL_PORT_STR "10005" +# define ACE_DEFAULT_LOCAL_PORT_STR "10005" #endif /* ACE_DEFAULT_LOCAL_PORT_STR */ // Used for the name server. #if !defined (ACE_DEFAULT_NAME_SERVER_PORT) -#define ACE_DEFAULT_NAME_SERVER_PORT 10006 +# define ACE_DEFAULT_NAME_SERVER_PORT 10006 #endif /* ACE_DEFAULT_NAME_SERVER_PORT */ #if !defined (ACE_DEFAULT_NAME_SERVER_PORT_STR) -#define ACE_DEFAULT_NAME_SERVER_PORT_STR "10006" +# define ACE_DEFAULT_NAME_SERVER_PORT_STR "10006" #endif /* ACE_DEFAULT_NAME_SERVER_PORT_STR */ // Used for the token server. #if !defined (ACE_DEFAULT_TOKEN_SERVER_PORT) -#define ACE_DEFAULT_TOKEN_SERVER_PORT 10007 +# define ACE_DEFAULT_TOKEN_SERVER_PORT 10007 #endif /* ACE_DEFAULT_TOKEN_SERVER_PORT */ #if !defined (ACE_DEFAULT_TOKEN_SERVER_PORT_STR) -#define ACE_DEFAULT_TOKEN_SERVER_PORT_STR "10007" +# define ACE_DEFAULT_TOKEN_SERVER_PORT_STR "10007" #endif /* ACE_DEFAULT_TOKEN_SERVER_PORT_STR */ // Used for the logging server. #if !defined (ACE_DEFAULT_LOGGING_SERVER_PORT) -#define ACE_DEFAULT_LOGGING_SERVER_PORT 10008 +# define ACE_DEFAULT_LOGGING_SERVER_PORT 10008 #endif /* ACE_DEFAULT_LOGGING_SERVER_PORT */ #if !defined (ACE_DEFAULT_LOGGING_SERVER_PORT_STR) -#define ACE_DEFAULT_LOGGING_SERVER_PORT_STR "10008" +# define ACE_DEFAULT_LOGGING_SERVER_PORT_STR "10008" #endif /* ACE_DEFAULT_LOGGING_SERVER_PORT_STR */ // Used for the logging server. #if !defined (ACE_DEFAULT_THR_LOGGING_SERVER_PORT) -#define ACE_DEFAULT_THR_LOGGING_SERVER_PORT 10008 +# define ACE_DEFAULT_THR_LOGGING_SERVER_PORT 10008 #endif /* ACE_DEFAULT_THR_LOGGING_SERVER_PORT */ #if !defined (ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR) -#define ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR "10008" +# define ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR "10008" #endif /* ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR */ // Used for the time server. #if !defined (ACE_DEFAULT_TIME_SERVER_PORT) -#define ACE_DEFAULT_TIME_SERVER_PORT 10009 +# define ACE_DEFAULT_TIME_SERVER_PORT 10009 #endif /* ACE_DEFAULT_TIME_SERVER_PORT */ #if !defined (ACE_DEFAULT_TIME_SERVER_PORT_STR) -#define ACE_DEFAULT_TIME_SERVER_PORT_STR "10009" +# define ACE_DEFAULT_TIME_SERVER_PORT_STR "10009" #endif /* ACE_DEFAULT_TIME_SERVER_PORT_STR */ #if !defined (ACE_DEFAULT_TIME_SERVER_STR) -#define ACE_DEFAULT_TIME_SERVER_STR "ACE_TS_TIME" +# define ACE_DEFAULT_TIME_SERVER_STR "ACE_TS_TIME" #endif /* ACE_DEFAULT_TIME_SERVER_STR */ // Used by the FIFO tests and the Client_Logging_Handler netsvc. #if !defined (ACE_DEFAULT_RENDEZVOUS) -#if defined (ACE_HAS_STREAM_PIPES) -#define ACE_DEFAULT_RENDEZVOUS "/tmp/fifo.ace" -#else -#define ACE_DEFAULT_RENDEZVOUS "localhost:10010" -#endif /* ACE_LACKS_FIFO */ +# if defined (ACE_HAS_STREAM_PIPES) +# define ACE_DEFAULT_RENDEZVOUS "/tmp/fifo.ace" +# else +# define ACE_DEFAULT_RENDEZVOUS "localhost:10010" +# endif /* ACE_LACKS_FIFO */ #endif /* ACE_DEFAULT_RENDEZVOUS */ #if !defined (ACE_DEFAULT_LOGGER_KEY) -#if defined (ACE_HAS_UNICODE) && defined (UNICODE) -#if defined (ACE_HAS_STREAM_PIPES) -#define ACE_DEFAULT_LOGGER_KEY L"/tmp/server_daemon" -#else -#define ACE_DEFAULT_LOGGER_KEY L"localhost:10012" -#endif /* ACE_HAS_STREAM_PIPES */ -#else /* ACE_HAS_UNICODE */ -#if defined (ACE_HAS_STREAM_PIPES) -#define ACE_DEFAULT_LOGGER_KEY "/tmp/server_daemon" -#else -#define ACE_DEFAULT_LOGGER_KEY "localhost:10012" -#endif /* ACE_HAS_STREAM_PIPES */ -#endif /* ACE_HAS_UNICODE && UNICODE */ +# if defined (ACE_HAS_UNICODE) && defined (UNICODE) +# if defined (ACE_HAS_STREAM_PIPES) +# define ACE_DEFAULT_LOGGER_KEY L"/tmp/server_daemon" +# else +# define ACE_DEFAULT_LOGGER_KEY L"localhost:10012" +# endif /* ACE_HAS_STREAM_PIPES */ +# else /* ACE_HAS_UNICODE */ +# if defined (ACE_HAS_STREAM_PIPES) +# define ACE_DEFAULT_LOGGER_KEY "/tmp/server_daemon" +# else +# define ACE_DEFAULT_LOGGER_KEY "localhost:10012" +# endif /* ACE_HAS_STREAM_PIPES */ +# endif /* ACE_HAS_UNICODE && UNICODE */ #endif /* ACE_DEFAULT_LOGGER_KEY */ #if !defined (ACE_DEFAULT_SERVER_HOST) -#define ACE_DEFAULT_SERVER_HOST "localhost" +# define ACE_DEFAULT_SERVER_HOST "localhost" #endif /* ACE_DEFAULT_SERVER_HOST */ // Default shared memory key #if !defined (ACE_DEFAULT_SHM_KEY) -#define ACE_DEFAULT_SHM_KEY 1234 +# define ACE_DEFAULT_SHM_KEY 1234 #endif /* ACE_DEFAULT_SHM_KEY */ // Default segment size used by SYSV shared memory (128 K) #if !defined (ACE_DEFAULT_SEGMENT_SIZE) -#define ACE_DEFAULT_SEGMENT_SIZE 1024 * 128 +# define ACE_DEFAULT_SEGMENT_SIZE 1024 * 128 #endif /* ACE_DEFAULT_SEGMENT_SIZE */ // Maximum number of SYSV shared memory segments // (does anyone know how to figure out the right values?!) #if !defined (ACE_DEFAULT_MAX_SEGMENTS) -#define ACE_DEFAULT_MAX_SEGMENTS 6 +# define ACE_DEFAULT_MAX_SEGMENTS 6 #endif /* ACE_DEFAULT_MAX_SEGMENTS */ // Name of the map that's stored in shared memory. #if !defined (ACE_NAME_SERVER_MAP) -#define ACE_NAME_SERVER_MAP "Name Server Map" +# define ACE_NAME_SERVER_MAP "Name Server Map" #endif /* ACE_NAME_SERVER_MAP */ // Default file permissions. #if !defined (ACE_DEFAULT_FILE_PERMS) -#define ACE_DEFAULT_FILE_PERMS 0666 +# define ACE_DEFAULT_FILE_PERMS 0666 #endif /* ACE_DEFAULT_FILE_PERMS */ // Default directory permissions. #if !defined (ACE_DEFAULT_DIR_PERMS) -#define ACE_DEFAULT_DIR_PERMS 0777 +# define ACE_DEFAULT_DIR_PERMS 0777 #endif /* ACE_DEFAULT_DIR_PERMS */ // Default size of the ACE Reactor. #if !defined (ACE_DEFAULT_SELECT_REACTOR_SIZE) -#define ACE_DEFAULT_SELECT_REACTOR_SIZE FD_SETSIZE +# define ACE_DEFAULT_SELECT_REACTOR_SIZE FD_SETSIZE #endif /* ACE_DEFAULT_SELECT_REACTOR_SIZE */ // Default size of the ACE Map_Manager. #if !defined (ACE_DEFAULT_MAP_SIZE) -#define ACE_DEFAULT_MAP_SIZE 1024 +# define ACE_DEFAULT_MAP_SIZE 1024 #endif /* ACE_DEFAULT_MAP_SIZE */ // Defaults for ACE Timer Wheel #if !defined (ACE_DEFAULT_TIMER_WHEEL_SIZE) -#define ACE_DEFAULT_TIMER_WHEEL_SIZE 1024 +# define ACE_DEFAULT_TIMER_WHEEL_SIZE 1024 #endif /* ACE_DEFAULT_TIMER_WHEEL_SIZE */ #if !defined (ACE_DEFAULT_TIMER_WHEEL_RESOLUTION) -#define ACE_DEFAULT_TIMER_WHEEL_RESOLUTION 100 +# define ACE_DEFAULT_TIMER_WHEEL_RESOLUTION 100 #endif /* ACE_DEFAULT_TIMER_WHEEL_RESOLUTION */ // Default size for ACE Timer Hash table #if !defined (ACE_DEFAULT_TIMER_HASH_TABLE_SIZE) -#define ACE_DEFAULT_TIMER_HASH_TABLE_SIZE 1024 +# define ACE_DEFAULT_TIMER_HASH_TABLE_SIZE 1024 #endif /* ACE_DEFAULT_TIMER_HASH_TABLE_SIZE */ // Defaults for the ACE Free List #if !defined (ACE_DEFAULT_FREE_LIST_PREALLOC) -#define ACE_DEFAULT_FREE_LIST_PREALLOC 0 +# define ACE_DEFAULT_FREE_LIST_PREALLOC 0 #endif /* ACE_DEFAULT_FREE_LIST_PREALLOC */ #if !defined (ACE_DEFAULT_FREE_LIST_LWM) -#define ACE_DEFAULT_FREE_LIST_LWM 0 +# define ACE_DEFAULT_FREE_LIST_LWM 0 #endif /* ACE_DEFAULT_FREE_LIST_LWM */ #if !defined (ACE_DEFAULT_FREE_LIST_HWM) -#define ACE_DEFAULT_FREE_LIST_HWM 25000 +# define ACE_DEFAULT_FREE_LIST_HWM 25000 #endif /* ACE_DEFAULT_FREE_LIST_HWM */ #if !defined (ACE_DEFAULT_FREE_LIST_INC) @@ -301,13 +305,13 @@ #endif /* ACE_DEFAULT_FREE_LIST_INC */ #if !defined (ACE_UNIQUE_NAME_LEN) -#define ACE_UNIQUE_NAME_LEN 100 +# define ACE_UNIQUE_NAME_LEN 100 #endif /* ACE_UNIQUE_NAME_LEN */ #if !defined (ACE_MAX_DGRAM_SIZE) -// This is just a guess. 8k is the normal limit on -// most machines because that's what NFS expects. -#define ACE_MAX_DGRAM_SIZE 8192 + // This is just a guess. 8k is the normal limit on + // most machines because that's what NFS expects. +# define ACE_MAX_DGRAM_SIZE 8192 #endif /* ACE_MAX_DGRAM_SIZE */ // Because most WinCE APIs use wchar strings, many of ACE functions @@ -318,11 +322,11 @@ // ASYS stands for ACE SYSTEM something. #if defined (ACE_HAS_MOSTLY_UNICODE_APIS) -#define ASYS_TCHAR wchar_t -#define ASYS_TEXT(STRING) _TEXT(STRING) +# define ASYS_TCHAR wchar_t +# define ASYS_TEXT(STRING) _TEXT(STRING) #else -#define ASYS_TCHAR char -#define ASYS_TEXT(STRING) STRING +# define ASYS_TCHAR char +# define ASYS_TEXT(STRING) STRING #endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ // Here are all ACE-specific global declarations needed throughout @@ -340,9 +344,9 @@ #define ACE_PURE_FREE_LIST 2 #if defined (ACE_NDEBUG) -#define ACE_DB(X) +# define ACE_DB(X) #else -#define ACE_DB(X) X +# define ACE_DB(X) X #endif /* ACE_NDEBUG */ // ACE_NO_HEAP_CHECK macro can be used to suppress false report of @@ -353,11 +357,11 @@ // This is necessary to work around bugs with Win32 non-blocking // connects... -# if !defined (ACE_NON_BLOCKING_BUG_DELAY) -# define ACE_NON_BLOCKING_BUG_DELAY 35000 -# endif /* ACE_NON_BLOCKING_BUG_DELAY */ +# if !defined (ACE_NON_BLOCKING_BUG_DELAY) +# define ACE_NON_BLOCKING_BUG_DELAY 35000 +# endif /* ACE_NON_BLOCKING_BUG_DELAY */ -# if defined (_DEBUG) && !defined (ACE_HAS_WINCE) +# if defined (_DEBUG) && !defined (ACE_HAS_WINCE) class ACE_No_Heap_Check { public: @@ -368,12 +372,12 @@ public: private: int old_state; }; -# define ACE_NO_HEAP_CHECK ACE_No_Heap_Check ____no_heap; -# else /* !_DEBUG */ -# define ACE_NO_HEAP_CHECK -# endif /* _DEBUG */ +# define ACE_NO_HEAP_CHECK ACE_No_Heap_Check ____no_heap; +# else /* !_DEBUG */ +# define ACE_NO_HEAP_CHECK +# endif /* _DEBUG */ #else /* !ACE_WIN32 */ -# define ACE_NO_HEAP_CHECK +# define ACE_NO_HEAP_CHECK #endif /* ACE_WIN32 */ // Turn a number into a string. @@ -403,15 +407,15 @@ private: // This eliminates the warnings, and no code is generated for the null // conditional statement. NOTE: that may only be true if -O is enabled, // such as with GreenHills (ghs) 1.8.8. -#define ACE_UNUSED_ARG(a) {if (&a) /* null */ ;} +# define ACE_UNUSED_ARG(a) {if (&a) /* null */ ;} #else -#define ACE_UNUSED_ARG(a) (a) +# define ACE_UNUSED_ARG(a) (a) #endif /* ghs */ #if defined (__sgi) || defined (ghs) || defined (DEC_CXX) -#define ACE_NOTREACHED(a) +# define ACE_NOTREACHED(a) #else -#define ACE_NOTREACHED(a) a +# define ACE_NOTREACHED(a) a #endif /* defined (__sgi) || defined (ghs) || defined (DEC_CXX) */ #if defined (ACE_REQUIRES_FUNC_DEFINITIONS) @@ -433,28 +437,28 @@ friend class ace_dewarn_gplusplus // automatically handled on a per-object basis. #if defined (ACE_HAS_ALLOC_HOOKS) -#define ACE_ALLOC_HOOK_DECLARE \ +# define ACE_ALLOC_HOOK_DECLARE \ void *operator new (size_t bytes); \ void operator delete (void *ptr); -// Note that these are just place holders for now. They'll -// be replaced by the ACE_Malloc stuff shortly... -#define ACE_ALLOC_HOOK_DEFINE(CLASS) \ + // Note that these are just place holders for now. They'll + // be replaced by the ACE_Malloc stuff shortly... +# define ACE_ALLOC_HOOK_DEFINE(CLASS) \ void *CLASS::operator new (size_t bytes) { return ::new char[bytes]; } \ void CLASS::operator delete (void *ptr) { delete (ptr); } #else -#define ACE_ALLOC_HOOK_DECLARE struct __Ace {} /* Just need a dummy... */ -#define ACE_ALLOC_HOOK_DEFINE(CLASS) +# define ACE_ALLOC_HOOK_DECLARE struct __Ace {} /* Just need a dummy... */ +# define ACE_ALLOC_HOOK_DEFINE(CLASS) #endif /* ACE_HAS_ALLOC_HOOKS */ #if defined (ACE_LACKS_KEY_T) -#if defined (ACE_WIN32) -// Win32 doesn't use numeric values to name its semaphores, it uses -// strings! +# if defined (ACE_WIN32) + // Win32 doesn't use numeric values to name its semaphores, it uses + // strings! typedef char *key_t; -#else +# else typedef int key_t; -#endif /* ACE_WIN32 */ +# endif /* ACE_WIN32 */ #endif /* ACE_LACKS_KEY_T */ #if defined (VXWORKS) @@ -564,21 +568,21 @@ typedef struct // Used for ACE_MMAP_Memory_Pool #if !defined (ACE_DEFAULT_BACKING_STORE) -#define ACE_DEFAULT_BACKING_STORE "/tmp/ace-malloc-XXXXXX" +# define ACE_DEFAULT_BACKING_STORE "/tmp/ace-malloc-XXXXXX" #endif /* ACE_DEFAULT_BACKING_STORE */ // Used for logging #if !defined (ACE_DEFAULT_LOGFILE) -#define ACE_DEFAULT_LOGFILE "/tmp/logfile" +# define ACE_DEFAULT_LOGFILE "/tmp/logfile" #endif /* ACE_DEFAULT_LOGFILE */ // Used for dynamic linking. #if !defined (ACE_DEFAULT_SVC_CONF) -#define ACE_DEFAULT_SVC_CONF "./svc.conf" +# define ACE_DEFAULT_SVC_CONF "./svc.conf" #endif /* ACE_DEFAULT_SVC_CONF */ #if !defined (ACE_DEFAULT_SEM_KEY) -#define ACE_DEFAULT_SEM_KEY "ACE_SEM_KEY" +# define ACE_DEFAULT_SEM_KEY "ACE_SEM_KEY" #endif /* ACE_DEFAULT_SEM_KEY */ #define ACE_STDIN 0 @@ -598,83 +602,83 @@ typedef struct #define ACE_PLATFORM_EXE_SUFFIX_A "" #if defined (ACE_HAS_UNICODE) -#define ACE_DIRECTORY_SEPARATOR_STR_W L"/" -#define ACE_DIRECTORY_SEPARATOR_CHAR_W L'/' -#define ACE_PLATFORM_W L"pSOS" -#define ACE_PLATFORM_EXE_SUFFIX_W L"" +# define ACE_DIRECTORY_SEPARATOR_STR_W L"/" +# define ACE_DIRECTORY_SEPARATOR_CHAR_W L'/' +# define ACE_PLATFORM_W L"pSOS" +# define ACE_PLATFORM_EXE_SUFFIX_W L"" #else -#define ACE_DIRECTORY_SEPARATOR_STR_W "/" -#define ACE_DIRECTORY_SEPARATOR_CHAR_W '/' -#define ACE_PLATFORM_W "pSOS" -#define ACE_PLATFORM_EXE_SUFFIX_W "" +# define ACE_DIRECTORY_SEPARATOR_STR_W "/" +# define ACE_DIRECTORY_SEPARATOR_CHAR_W '/' +# define ACE_PLATFORM_W "pSOS" +# define ACE_PLATFORM_EXE_SUFFIX_W "" #endif /* ACE_HAS_UNICODE */ #define ACE_MAX_DEFAULT_PORT 65535 #if ! defined(MAXPATHLEN) -#define MAXPATHLEN 1024 +# define MAXPATHLEN 1024 #endif /* MAXPATHLEN */ #if ! defined(MAXNAMLEN) -#define MAXNAMLEN 255 +# define MAXNAMLEN 255 #endif /* MAXNAMLEN */ #if ! defined(MAXHOSTNAMELEN) -#define MAXHOSTNAMELEN 256 +# define MAXHOSTNAMELEN 256 #endif /* MAXHOSTNAMELEN */ #if defined (ACE_LACKS_MMAP) -#define PROT_READ 0 -#define PROT_WRITE 0 -#define PROT_EXEC 0 -#define PROT_NONE 0 -#define PROT_RDWR 0 -#define MAP_PRIVATE 0 -#define MAP_SHARED 0 -#define MAP_FIXED 0 +# define PROT_READ 0 +# define PROT_WRITE 0 +# define PROT_EXEC 0 +# define PROT_NONE 0 +# define PROT_RDWR 0 +# define MAP_PRIVATE 0 +# define MAP_SHARED 0 +# define MAP_FIXED 0 #endif /* ACE_LACKS_MMAP */ // The following 3 defines are used by the ACE Name Server... #if !defined (ACE_DEFAULT_NAMESPACE_DIR_A) -#define ACE_DEFAULT_NAMESPACE_DIR_A "/tmp" +# define ACE_DEFAULT_NAMESPACE_DIR_A "/tmp" #endif /* ACE_DEFAULT_NAMESPACE_DIR_A */ #if !defined (ACE_DEFAULT_LOCALNAME_A) -#define ACE_DEFAULT_LOCALNAME_A "localnames" +# define ACE_DEFAULT_LOCALNAME_A "localnames" #endif /* ACE_DEFAULT_LOCALNAME_A */ #if !defined (ACE_DEFAULT_GLOBALNAME_A) -#define ACE_DEFAULT_GLOBALNAME_A "globalnames" +# define ACE_DEFAULT_GLOBALNAME_A "globalnames" #endif /* ACE_DEFAULT_GLOBALNAME_A */ #if defined (ACE_HAS_UNICODE) -#if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) -#define ACE_DEFAULT_NAMESPACE_DIR_W L"/tmp" -#endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ -#if !defined (ACE_DEFAULT_LOCALNAME_W) -#define ACE_DEFAULT_LOCALNAME_W L"localnames" -#endif /* ACE_DEFAULT_LOCALNAME_W */ -#if !defined (ACE_DEFAULT_GLOBALNAME_W) -#define ACE_DEFAULT_GLOBALNAME_W L"globalnames" -#endif /* ACE_DEFAULT_GLOBALNAME_W */ +# if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) +# define ACE_DEFAULT_NAMESPACE_DIR_W L"/tmp" +# endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ +# if !defined (ACE_DEFAULT_LOCALNAME_W) +# define ACE_DEFAULT_LOCALNAME_W L"localnames" +# endif /* ACE_DEFAULT_LOCALNAME_W */ +# if !defined (ACE_DEFAULT_GLOBALNAME_W) +# define ACE_DEFAULT_GLOBALNAME_W L"globalnames" +# endif /* ACE_DEFAULT_GLOBALNAME_W */ #else -#if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) -#define ACE_DEFAULT_NAMESPACE_DIR_W "/tmp" -#endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ -#if !defined (ACE_DEFAULT_LOCALNAME_W) -#define ACE_DEFAULT_LOCALNAME_W "localnames" -#endif /* ACE_DEFAULT_LOCALNAME_W */ -#if !defined (ACE_DEFAULT_GLOBALNAME_W) -#define ACE_DEFAULT_GLOBALNAME_W "globalnames" -#endif /* ACE_DEFAULT_GLOBALNAME_W */ +# if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) +# define ACE_DEFAULT_NAMESPACE_DIR_W "/tmp" +# endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ +# if !defined (ACE_DEFAULT_LOCALNAME_W) +# define ACE_DEFAULT_LOCALNAME_W "localnames" +# endif /* ACE_DEFAULT_LOCALNAME_W */ +# if !defined (ACE_DEFAULT_GLOBALNAME_W) +# define ACE_DEFAULT_GLOBALNAME_W "globalnames" +# endif /* ACE_DEFAULT_GLOBALNAME_W */ #endif /* ACE_HAS_UNICODE */ #if !defined (__TEXT) -#if (defined (ACE_HAS_UNICODE) && (defined (UNICODE))) -#define __TEXT(STRING) L##STRING -#else -#define __TEXT(STRING) STRING -#endif /* UNICODE && ACE_HAS_UNICODE */ +# if (defined (ACE_HAS_UNICODE) && (defined (UNICODE))) +# define __TEXT(STRING) L##STRING +# else +# define __TEXT(STRING) STRING +# endif /* UNICODE && ACE_HAS_UNICODE */ #endif /* !defined __TEXT */ typedef int ACE_HANDLE; @@ -713,25 +717,25 @@ typedef char TCHAR; #define ACE_SEH_FINALLY if (1) #if !defined (LPSECURITY_ATTRIBUTES) -#define LPSECURITY_ATTRIBUTES int +# define LPSECURITY_ATTRIBUTES int #endif /* !defined LPSECURITY_ATTRIBUTES */ #if !defined (GENERIC_READ) -#define GENERIC_READ 0 +# define GENERIC_READ 0 #endif /* !defined GENERIC_READ */ #if !defined (FILE_SHARE_READ) -#define FILE_SHARE_READ 0 +# define FILE_SHARE_READ 0 #endif /* !defined FILE_SHARE_READ */ #if !defined (OPEN_EXISTING) -#define OPEN_EXISTING 0 +# define OPEN_EXISTING 0 #endif /* !defined OPEN_EXISTING */ #if !defined (FILE_ATTRIBUTE_NORMAL) -#define FILE_ATTRIBUTE_NORMAL 0 +# define FILE_ATTRIBUTE_NORMAL 0 #endif /* !defined FILE_ATTRIBUTE_NORMAL */ #if !defined (MAXIMUM_WAIT_OBJECTS) -#define MAXIMUM_WAIT_OBJECTS 0 +# define MAXIMUM_WAIT_OBJECTS 0 #endif /* !defined MAXIMUM_WAIT_OBJECTS */ #if !defined (FILE_FLAG_OVERLAPPED) -#define FILE_FLAG_OVERLAPPED 0 +# define FILE_FLAG_OVERLAPPED 0 #endif /* !defined FILE_FLAG_OVERLAPPED */ struct ACE_OVERLAPPED @@ -810,31 +814,31 @@ private: #if defined (ACE_HAS_CHARPTR_SPRINTF) -#define ACE_SPRINTF_ADAPTER(X) ::strlen (X) +# define ACE_SPRINTF_ADAPTER(X) ::strlen (X) #else -#define ACE_SPRINTF_ADAPTER(X) X +# define ACE_SPRINTF_ADAPTER(X) X #endif /* ACE_HAS_CHARPTR_SPRINTF */ #if defined (__ACE_INLINE__) -#define ACE_INLINE inline -#if !defined (ACE_HAS_INLINED_OSCALLS) -#define ACE_HAS_INLINED_OSCALLS -#endif /* !ACE_HAS_INLINED_OSCALLS */ +# define ACE_INLINE inline +# if !defined (ACE_HAS_INLINED_OSCALLS) +# define ACE_HAS_INLINED_OSCALLS +# endif /* !ACE_HAS_INLINED_OSCALLS */ #else -#define ACE_INLINE +# define ACE_INLINE #endif /* __ACE_INLINE__ */ // Default address for shared memory mapped files and SYSV shared memory // (defaults to 64 M). #if !defined (ACE_DEFAULT_BASE_ADDR) -#define ACE_DEFAULT_BASE_ADDR ((char *) (64 * 1024 * 1024)) +# define ACE_DEFAULT_BASE_ADDR ((char *) (64 * 1024 * 1024)) #endif /* ACE_DEFAULT_BASE_ADDR */ // This fudge factor can be overriden for timers that need it, such as on // Solaris, by defining the ACE_TIMER_SKEW symbol in the appropriate config // header. #if !defined (ACE_TIMER_SKEW) -#define ACE_TIMER_SKEW 0 +# define ACE_TIMER_SKEW 0 #endif /* ACE_TIMER_SKEW */ // Nasty macro stuff to account for Microsoft Win32 DLL nonsense. We @@ -843,60 +847,60 @@ private: // First, we define how to properly export/import objects. #if defined (ACE_WIN32) // Only Win32 needs special treatment. -# if !defined (_MSC_VER) /* Mark classes as exported, Borland. */ -# define ACE_Proper_Export_Flag _export -# define ACE_Proper_Import_Flag _import +# if !defined (_MSC_VER) /* Mark classes as exported, Borland. */ +# define ACE_Proper_Export_Flag _export +# define ACE_Proper_Import_Flag _import // @@ Don't know how to handle this when using Borland's compilers. -# define ACE_EXPORT_SINGLETON_DECLARATION(T) -# define ACE_IMPORT_SINGLETON_DECLARATION(T) -# define ACE_PROPER_SINGLETON_INSTANTIATION(T) -# else /* Microsoft: */ -# define ACE_Proper_Export_Flag __declspec (dllexport) -# define ACE_Proper_Import_Flag __declspec (dllimport) -# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T -# define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T -# define ACE_PROPER_SINGLETON_INSTANTIATION(T) template class T -# endif /* !_MSC_VER */ +# define ACE_EXPORT_SINGLETON_DECLARATION(T) +# define ACE_IMPORT_SINGLETON_DECLARATION(T) +# define ACE_PROPER_SINGLETON_INSTANTIATION(T) +# else /* Microsoft: */ +# define ACE_Proper_Export_Flag __declspec (dllexport) +# define ACE_Proper_Import_Flag __declspec (dllimport) +# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class __declspec (dllexport) T +# define ACE_IMPORT_SINGLETON_DECLARATION(T) extern template class T +# define ACE_PROPER_SINGLETON_INSTANTIATION(T) template class T +# endif /* !_MSC_VER */ #else /* ! ACE_WIN32 */ -# define ACE_Proper_Export_Flag -# define ACE_Proper_Import_Flag -# define ACE_EXPORT_SINGLETON_DECLARATION(T) -# define ACE_IMPORT_SINGLETON_DECLARATION(T) -# define ACE_PROPER_SINGLETON_INSTANTIATION(T) +# define ACE_Proper_Export_Flag +# define ACE_Proper_Import_Flag +# define ACE_EXPORT_SINGLETON_DECLARATION(T) +# define ACE_IMPORT_SINGLETON_DECLARATION(T) +# define ACE_PROPER_SINGLETON_INSTANTIATION(T) #endif /* ACE_WIN32 */ // Here are definition for ACE library. #if defined (ACE_HAS_DLL) && (ACE_HAS_DLL == 1) -# if defined (ACE_BUILD_DLL) -# define ACE_Export ACE_Proper_Export_Flag -# define ACE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T) -# else -# define ACE_Export ACE_Proper_Import_Flag -# define ACE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_SINGLETON_INSTANTIATION(T) -# endif /* ACE_BUILD_DLL */ +# if defined (ACE_BUILD_DLL) +# define ACE_Export ACE_Proper_Export_Flag +# define ACE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ACE_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T) +# else +# define ACE_Export ACE_Proper_Import_Flag +# define ACE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ACE_SINGLETON_INSTANTIATION(T) +# endif /* ACE_BUILD_DLL */ #else /* ! ACE_HAS_DLL */ -# define ACE_Export -# define ACE_SINGLETON_DECLARATION(T) -# define ACE_SINGLETON_INSTANTIATION(T) +# define ACE_Export +# define ACE_SINGLETON_DECLARATION(T) +# define ACE_SINGLETON_INSTANTIATION(T) #endif /* ACE_HAS_DLL */ // Here are definition for ACE_Svc library. #if defined (ACE_HAS_SVC_DLL) && (ACE_HAS_SVC_DLL == 1) -# if defined (ACE_BUILD_SVC_DLL) -# define ACE_Svc_Export ACE_Proper_Export_Flag -# define ACE_SVC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define ACE_SVC_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T) -# else -# define ACE_Svc_Export ACE_Proper_Import_Flag -# define ACE_SVC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define ACE_SVC_SINGLETON_INSTANTIATION(T) -# endif /* ACE_BUILD_SVC_DLL */ +# if defined (ACE_BUILD_SVC_DLL) +# define ACE_Svc_Export ACE_Proper_Export_Flag +# define ACE_SVC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ACE_SVC_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T) +# else +# define ACE_Svc_Export ACE_Proper_Import_Flag +# define ACE_SVC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ACE_SVC_SINGLETON_INSTANTIATION(T) +# endif /* ACE_BUILD_SVC_DLL */ #else /* ACE_HAS_SVC_DLL */ -# define ACE_Svc_Export -# define ACE_SVC_SINGLETON_DECLARATION(T) -# define ACE_SVC_SINGLETON_INSTANTIATION(T) +# define ACE_Svc_Export +# define ACE_SVC_SINGLETON_DECLARATION(T) +# define ACE_SVC_SINGLETON_INSTANTIATION(T) #endif /* ACE_HAS_SVC_DLL */ // This is a whim of mine -- that instead of annotating a class with @@ -916,11 +920,11 @@ private: // Just to be safe we'll do it with pthreads, too -- jwr #if defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS) extern "C" { -#include /**/ <pthread.h> -#if defined (DIGITAL_UNIX) -#define pthread_self __pthread_self +# include /**/ <pthread.h> +# if defined (DIGITAL_UNIX) +# define pthread_self __pthread_self extern "C" pthread_t pthread_self (void); -#endif /* DIGITAL_UNIX */ +# endif /* DIGITAL_UNIX */ } #endif /* ACE_HAS_DCETHREADS */ @@ -941,27 +945,27 @@ extern "C" pthread_t pthread_self (void); #endif /* ACE_HAS_PTHREADS_1003_DOT_1C */ #if (ACE_NTRACE == 1) -#define ACE_TRACE(X) +# define ACE_TRACE(X) #else -#define ACE_TRACE(X) ACE_Trace ____ (ASYS_TEXT (X), __LINE__, ASYS_TEXT (__FILE__)) +# define ACE_TRACE(X) ACE_Trace ____ (ASYS_TEXT (X), __LINE__, ASYS_TEXT (__FILE__)) #endif /* ACE_NTRACE */ #if !defined (ACE_HAS_WINCE) -#include /**/ <time.h> -#if defined (__Lynx__) -# include /**/ <st.h> -# include /**/ <sem.h> -#endif /* __Lynx__ */ +# include /**/ <time.h> +# if defined (__Lynx__) +# include /**/ <st.h> +# include /**/ <sem.h> +# endif /* __Lynx__ */ #endif /* ACE_HAS_WINCE */ #if defined (ACE_NEEDS_SYSTIME_H) // Some platforms may need to include this, but I suspect that most // will get it from <time.h> -#if defined (VXWORKS) -#include /**/ <sys/times.h> -#else -#include /**/ <sys/time.h> -#endif /* VXWORKS */ +# if defined (VXWORKS) +# include /**/ <sys/times.h> +# else +# include /**/ <sys/time.h> +# endif /* VXWORKS */ #endif /* ACE_NEEDS_SYSTIME_H */ #if !defined (ACE_HAS_POSIX_TIME) @@ -973,7 +977,7 @@ typedef struct timespec } timespec_t; #elif defined (ACE_HAS_BROKEN_POSIX_TIME) // OSF/1 defines struct timespec in <sys/timers.h> - Tom Marrs -#include /**/ <sys/timers.h> +# include /**/ <sys/timers.h> #endif /* !ACE_HAS_POSIX_TIME */ #if defined(ACE_LACKS_TIMESPEC_T) @@ -982,9 +986,9 @@ typedef struct timespec timespec_t; #if !defined (ACE_HAS_CLOCK_GETTIME) && !defined (_CLOCKID_T) typedef int clockid_t; -#if !defined (CLOCK_REALTIME) -#define CLOCK_REALTIME 0 -#endif /* CLOCK_REALTIME */ +# if !defined (CLOCK_REALTIME) +# define CLOCK_REALTIME 0 +# endif /* CLOCK_REALTIME */ #endif /* ! ACE_HAS_CLOCK_GETTIME && ! _CLOCKID_T */ class ACE_Export ACE_Time_Value @@ -1170,15 +1174,15 @@ private: }; #if defined (ACE_HAS_USING_KEYWORD) -#define ACE_USING using +# define ACE_USING using #else -#define ACE_USING +# define ACE_USING #endif /* ACE_HAS_USING_KEYWORD */ #if defined (ACE_HAS_TYPENAME_KEYWORD) -#define ACE_TYPENAME typename +# define ACE_TYPENAME typename #else -#define ACE_TYPENAME +# define ACE_TYPENAME #endif /* ACE_HAS_TYPENAME_KEYWORD */ // The following is necessary since many C++ compilers don't support @@ -1189,179 +1193,179 @@ private: #if defined (ACE_HAS_TEMPLATE_TYPEDEFS) // Handle ACE_Message_Queue. -#define ACE_SYNCH_DECL class _ACE_SYNCH -#define ACE_SYNCH_USE _ACE_SYNCH -#define ACE_SYNCH_MUTEX_T ACE_TYPENAME _ACE_SYNCH::MUTEX -#define ACE_SYNCH_CONDITION_T ACE_TYPENAME _ACE_SYNCH::CONDITION -#define ACE_SYNCH_SEMAPHORE_T ACE_TYPENAME _ACE_SYNCH::SEMAPHORE +# define ACE_SYNCH_DECL class _ACE_SYNCH +# define ACE_SYNCH_USE _ACE_SYNCH +# define ACE_SYNCH_MUTEX_T ACE_TYPENAME _ACE_SYNCH::MUTEX +# define ACE_SYNCH_CONDITION_T ACE_TYPENAME _ACE_SYNCH::CONDITION +# define ACE_SYNCH_SEMAPHORE_T ACE_TYPENAME _ACE_SYNCH::SEMAPHORE // Handle ACE_Malloc* -#define ACE_MEM_POOL_1 class _ACE_MEM_POOL -#define ACE_MEM_POOL_2 _ACE_MEM_POOL -#define ACE_MEM_POOL _ACE_MEM_POOL -#define ACE_MEM_POOL_OPTIONS ACE_TYPENAME _ACE_MEM_POOL::OPTIONS +# define ACE_MEM_POOL_1 class _ACE_MEM_POOL +# define ACE_MEM_POOL_2 _ACE_MEM_POOL +# define ACE_MEM_POOL _ACE_MEM_POOL +# define ACE_MEM_POOL_OPTIONS ACE_TYPENAME _ACE_MEM_POOL::OPTIONS // Handle ACE_Svc_Handler -#define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM -#define ACE_PEER_STREAM_2 _ACE_PEER_STREAM -#define ACE_PEER_STREAM _ACE_PEER_STREAM -#define ACE_PEER_STREAM_ADDR ACE_TYPENAME _ACE_PEER_STREAM::PEER_ADDR +# define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM +# define ACE_PEER_STREAM_2 _ACE_PEER_STREAM +# define ACE_PEER_STREAM _ACE_PEER_STREAM +# define ACE_PEER_STREAM_ADDR ACE_TYPENAME _ACE_PEER_STREAM::PEER_ADDR // Handle ACE_Acceptor -#define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR -#define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR -#define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR -#define ACE_PEER_ACCEPTOR_ADDR ACE_TYPENAME _ACE_PEER_ACCEPTOR::PEER_ADDR +# define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR +# define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR +# define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR +# define ACE_PEER_ACCEPTOR_ADDR ACE_TYPENAME _ACE_PEER_ACCEPTOR::PEER_ADDR // Handle ACE_Connector -#define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR -#define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR -#define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR -#define ACE_PEER_CONNECTOR_ADDR ACE_TYPENAME _ACE_PEER_CONNECTOR::PEER_ADDR -#if !defined(ACE_HAS_TYPENAME_KEYWORD) -#define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_CONNECTOR_ADDR::sap_any -#else -// -// If the compiler supports 'typename' we cannot use -// -// PEER_CONNECTOR::PEER_ADDR::sap_any -// -// because PEER_CONNECTOR::PEER_ADDR is not considered a type. But: -// -// typename PEER_CONNECTOR::PEER_ADDR::sap_any -// -// will not work either, because now we are declaring sap_any a -// type, further: -// -// (typename PEER_CONNECTOR::PEER_ADDR)::sap_any -// -// is considered a casting expression. All I can think of is using a -// typedef, I tried PEER_ADDR but that was a source of trouble on -// some platforms. I will try: -// -#define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_ADDR_TYPEDEF::sap_any -#endif /* ACE_HAS_TYPENAME_KEYWORD */ +# define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR +# define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR +# define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR +# define ACE_PEER_CONNECTOR_ADDR ACE_TYPENAME _ACE_PEER_CONNECTOR::PEER_ADDR +# if !defined(ACE_HAS_TYPENAME_KEYWORD) +# define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_CONNECTOR_ADDR::sap_any +# else + // + // If the compiler supports 'typename' we cannot use + // + // PEER_CONNECTOR::PEER_ADDR::sap_any + // + // because PEER_CONNECTOR::PEER_ADDR is not considered a type. But: + // + // typename PEER_CONNECTOR::PEER_ADDR::sap_any + // + // will not work either, because now we are declaring sap_any a + // type, further: + // + // (typename PEER_CONNECTOR::PEER_ADDR)::sap_any + // + // is considered a casting expression. All I can think of is using a + // typedef, I tried PEER_ADDR but that was a source of trouble on + // some platforms. I will try: + // +# define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_ADDR_TYPEDEF::sap_any +# endif /* ACE_HAS_TYPENAME_KEYWORD */ // Handle ACE_SOCK_* -#define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor -#define ACE_SOCK_CONNECTOR ACE_SOCK_Connector -#define ACE_SOCK_STREAM ACE_SOCK_Stream +# define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor +# define ACE_SOCK_CONNECTOR ACE_SOCK_Connector +# define ACE_SOCK_STREAM ACE_SOCK_Stream // Handle ACE_LSOCK_* -#define ACE_LSOCK_ACCEPTOR ACE_LSOCK_Acceptor -#define ACE_LSOCK_CONNECTOR ACE_LSOCK_Connector -#define ACE_LSOCK_STREAM ACE_LSOCK_Stream +# define ACE_LSOCK_ACCEPTOR ACE_LSOCK_Acceptor +# define ACE_LSOCK_CONNECTOR ACE_LSOCK_Connector +# define ACE_LSOCK_STREAM ACE_LSOCK_Stream // Handle ACE_TLI_* -#define ACE_TLI_ACCEPTOR ACE_TLI_Acceptor -#define ACE_TLI_CONNECTOR ACE_TLI_Connector -#define ACE_TLI_STREAM ACE_TLI_Stream +# define ACE_TLI_ACCEPTOR ACE_TLI_Acceptor +# define ACE_TLI_CONNECTOR ACE_TLI_Connector +# define ACE_TLI_STREAM ACE_TLI_Stream // Handle ACE_SPIPE_* -#define ACE_SPIPE_ACCEPTOR ACE_SPIPE_Acceptor -#define ACE_SPIPE_CONNECTOR ACE_SPIPE_Connector -#define ACE_SPIPE_STREAM ACE_SPIPE_Stream +# define ACE_SPIPE_ACCEPTOR ACE_SPIPE_Acceptor +# define ACE_SPIPE_CONNECTOR ACE_SPIPE_Connector +# define ACE_SPIPE_STREAM ACE_SPIPE_Stream // Handle ACE_UPIPE_* -#define ACE_UPIPE_ACCEPTOR ACE_UPIPE_Acceptor -#define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector -#define ACE_UPIPE_STREAM ACE_UPIPE_Stream +# define ACE_UPIPE_ACCEPTOR ACE_UPIPE_Acceptor +# define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector +# define ACE_UPIPE_STREAM ACE_UPIPE_Stream // Handle ACE_FILE_* -#define ACE_FILE_CONNECTOR ACE_FILE_Connector -#define ACE_FILE_STREAM ACE_FILE_IO +# define ACE_FILE_CONNECTOR ACE_FILE_Connector +# define ACE_FILE_STREAM ACE_FILE_IO // Handle ACE_*_Memory_Pool. -#define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool -#define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool -#define ACE_SBRK_MEMORY_POOL ACE_Sbrk_Memory_Pool -#define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool -#define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool +# define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool +# define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool +# define ACE_SBRK_MEMORY_POOL ACE_Sbrk_Memory_Pool +# define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool +# define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool #else /* TEMPLATES are broken in some form or another (i.e., most C++ compilers) */ // Handle ACE_Message_Queue. -#if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) -#define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T, class _ACE_SYNCH_SEMAPHORE_T -#define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T, _ACE_SYNCH_SEMAPHORE_T -#else -#define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T -#define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T -#endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ -#define ACE_SYNCH_MUTEX_T _ACE_SYNCH_MUTEX_T -#define ACE_SYNCH_CONDITION_T _ACE_SYNCH_CONDITION_T -#define ACE_SYNCH_SEMAPHORE_T _ACE_SYNCH_SEMAPHORE_T +# if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) +# define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T, class _ACE_SYNCH_SEMAPHORE_T +# define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T, _ACE_SYNCH_SEMAPHORE_T +# else +# define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T +# define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T +# endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ +# define ACE_SYNCH_MUTEX_T _ACE_SYNCH_MUTEX_T +# define ACE_SYNCH_CONDITION_T _ACE_SYNCH_CONDITION_T +# define ACE_SYNCH_SEMAPHORE_T _ACE_SYNCH_SEMAPHORE_T // Handle ACE_Malloc* -#define ACE_MEM_POOL_1 class _ACE_MEM_POOL, class _ACE_MEM_POOL_OPTIONS -#define ACE_MEM_POOL_2 _ACE_MEM_POOL, _ACE_MEM_POOL_OPTIONS -#define ACE_MEM_POOL _ACE_MEM_POOL -#define ACE_MEM_POOL_OPTIONS _ACE_MEM_POOL_OPTIONS +# define ACE_MEM_POOL_1 class _ACE_MEM_POOL, class _ACE_MEM_POOL_OPTIONS +# define ACE_MEM_POOL_2 _ACE_MEM_POOL, _ACE_MEM_POOL_OPTIONS +# define ACE_MEM_POOL _ACE_MEM_POOL +# define ACE_MEM_POOL_OPTIONS _ACE_MEM_POOL_OPTIONS // Handle ACE_Svc_Handler -#define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM, class _ACE_PEER_ADDR -#define ACE_PEER_STREAM_2 _ACE_PEER_STREAM, _ACE_PEER_ADDR -#define ACE_PEER_STREAM _ACE_PEER_STREAM -#define ACE_PEER_STREAM_ADDR _ACE_PEER_ADDR +# define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM, class _ACE_PEER_ADDR +# define ACE_PEER_STREAM_2 _ACE_PEER_STREAM, _ACE_PEER_ADDR +# define ACE_PEER_STREAM _ACE_PEER_STREAM +# define ACE_PEER_STREAM_ADDR _ACE_PEER_ADDR // Handle ACE_Acceptor -#define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR, class _ACE_PEER_ADDR -#define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR, _ACE_PEER_ADDR -#define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR -#define ACE_PEER_ACCEPTOR_ADDR _ACE_PEER_ADDR +# define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR, class _ACE_PEER_ADDR +# define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR, _ACE_PEER_ADDR +# define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR +# define ACE_PEER_ACCEPTOR_ADDR _ACE_PEER_ADDR // Handle ACE_Connector -#define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR, class _ACE_PEER_ADDR -#define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR, _ACE_PEER_ADDR -#define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR -#define ACE_PEER_CONNECTOR_ADDR _ACE_PEER_ADDR -#define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_CONNECTOR_ADDR::sap_any +# define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR, class _ACE_PEER_ADDR +# define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR, _ACE_PEER_ADDR +# define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR +# define ACE_PEER_CONNECTOR_ADDR _ACE_PEER_ADDR +# define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_CONNECTOR_ADDR::sap_any // Handle ACE_SOCK_* -#define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor, ACE_INET_Addr -#define ACE_SOCK_CONNECTOR ACE_SOCK_Connector, ACE_INET_Addr -#define ACE_SOCK_STREAM ACE_SOCK_Stream, ACE_INET_Addr +# define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor, ACE_INET_Addr +# define ACE_SOCK_CONNECTOR ACE_SOCK_Connector, ACE_INET_Addr +# define ACE_SOCK_STREAM ACE_SOCK_Stream, ACE_INET_Addr // Handle ACE_LSOCK_* -#define ACE_LSOCK_ACCEPTOR ACE_LSOCK_Acceptor, ACE_UNIX_Addr -#define ACE_LSOCK_CONNECTOR ACE_LSOCK_Connector, ACE_UNIX_Addr -#define ACE_LSOCK_STREAM ACE_LSOCK_Stream, ACE_UNIX_Addr +# define ACE_LSOCK_ACCEPTOR ACE_LSOCK_Acceptor, ACE_UNIX_Addr +# define ACE_LSOCK_CONNECTOR ACE_LSOCK_Connector, ACE_UNIX_Addr +# define ACE_LSOCK_STREAM ACE_LSOCK_Stream, ACE_UNIX_Addr // Handle ACE_TLI_* -#define ACE_TLI_ACCEPTOR ACE_TLI_Acceptor, ACE_INET_Addr -#define ACE_TLI_CONNECTOR ACE_TLI_Connector, ACE_INET_Addr -#define ACE_TLI_STREAM ACE_TLI_Stream, ACE_INET_Addr +# define ACE_TLI_ACCEPTOR ACE_TLI_Acceptor, ACE_INET_Addr +# define ACE_TLI_CONNECTOR ACE_TLI_Connector, ACE_INET_Addr +# define ACE_TLI_STREAM ACE_TLI_Stream, ACE_INET_Addr // Handle ACE_SPIPE_* -#define ACE_SPIPE_ACCEPTOR ACE_SPIPE_Acceptor, ACE_SPIPE_Addr -#define ACE_SPIPE_CONNECTOR ACE_SPIPE_Connector, ACE_SPIPE_Addr -#define ACE_SPIPE_STREAM ACE_SPIPE_Stream, ACE_SPIPE_Addr +# define ACE_SPIPE_ACCEPTOR ACE_SPIPE_Acceptor, ACE_SPIPE_Addr +# define ACE_SPIPE_CONNECTOR ACE_SPIPE_Connector, ACE_SPIPE_Addr +# define ACE_SPIPE_STREAM ACE_SPIPE_Stream, ACE_SPIPE_Addr // Handle ACE_UPIPE_* -#define ACE_UPIPE_ACCEPTOR ACE_UPIPE_Acceptor, ACE_SPIPE_Addr -#define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector, ACE_SPIPE_Addr -#define ACE_UPIPE_STREAM ACE_UPIPE_Stream, ACE_SPIPE_Addr +# define ACE_UPIPE_ACCEPTOR ACE_UPIPE_Acceptor, ACE_SPIPE_Addr +# define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector, ACE_SPIPE_Addr +# define ACE_UPIPE_STREAM ACE_UPIPE_Stream, ACE_SPIPE_Addr // Handle ACE_FILE_* -#define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr -#define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr +# define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr +# define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr // Handle ACE_*_Memory_Pool. -#define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options -#define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options -#define ACE_SBRK_MEMORY_POOL ACE_Sbrk_Memory_Pool, ACE_Sbrk_Memory_Pool_Options -#define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool, ACE_Shared_Memory_Pool_Options -#define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool, ACE_Local_Memory_Pool_Options +# define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options +# define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options +# define ACE_SBRK_MEMORY_POOL ACE_Sbrk_Memory_Pool, ACE_Sbrk_Memory_Pool_Options +# define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool, ACE_Shared_Memory_Pool_Options +# define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool, ACE_Local_Memory_Pool_Options #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ // For Win32 compatibility... #if !defined (ACE_WSOCK_VERSION) -#define ACE_WSOCK_VERSION 0, 0 +# define ACE_WSOCK_VERSION 0, 0 #endif /* ACE_WSOCK_VERSION */ #if defined (ACE_HAS_BROKEN_CTIME) -#undef ctime +# undef ctime #endif /* ACE_HAS_BROKEN_CTIME */ extern "C" { @@ -1452,7 +1456,7 @@ struct strrecvfd {}; #endif /* ACE_LACKS_STRRECVFD */ #if defined (ACE_HAS_PROC_FS) -#include /**/ <sys/procfs.h> +# include /**/ <sys/procfs.h> #endif /* ACE_HAS_PROC_FD */ #if defined (ACE_HAS_UNICODE) @@ -1462,7 +1466,7 @@ struct strrecvfd {}; # include /**/ <wchar.h> # endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ #elif defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) -# include /**/ <wchar.h> +# include /**/ <wchar.h> #elif defined (ACE_LACKS_WCHAR_T) typedef ACE_UINT32 wchar_t; #endif /* ACE_HAS_UNICODE */ @@ -1486,12 +1490,12 @@ typedef const struct rlimit ACE_SETRLIMIT_TYPE; #endif /* ACE_HAS_BROKEN_SETRLIMIT */ #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) -#define ACE_MT(X) X -#if !defined (_REENTRANT) -#define _REENTRANT -#endif /* _REENTRANT */ +# define ACE_MT(X) X +# if !defined (_REENTRANT) +# define _REENTRANT +# endif /* _REENTRANT */ #else -#define ACE_MT(X) +# define ACE_MT(X) #endif /* ACE_MT_SAFE */ // These are the various states a thread managed by the @@ -1521,7 +1525,7 @@ enum ACE_Thread_State }; #if !defined (ACE_DEFAULT_THREAD_PRIORITY) -#define ACE_DEFAULT_THREAD_PRIORITY (-0x7fffffffL - 1L) +# define ACE_DEFAULT_THREAD_PRIORITY (-0x7fffffffL - 1L) #endif /* ACE_DEFAULT_THREAD_PRIORITY */ // Convenient macro for testing for deadlock, as well as for detecting @@ -1546,7 +1550,7 @@ enum ACE_Thread_State if (OBJ.locked () == 0) return RETURN; #if defined (ACE_HAS_POSIX_SEM) -#include /**/ <semaphore.h> +# include /**/ <semaphore.h> typedef struct { sem_t *sema_; @@ -1571,7 +1575,7 @@ struct cancel_state }; #if defined (ACE_HAS_WINCE) -#include /**/ <types.h> +# include /**/ <types.h> typedef DWORD nlink_t; @@ -1594,7 +1598,7 @@ struct stat { }; #else /* ! ACE_HAS_WINCE */ -#if defined (ACE_LACKS_SYS_TYPES_H) +# if defined (ACE_LACKS_SYS_TYPES_H) typedef unsigned char u_char; typedef unsigned short u_short; typedef unsigned int u_int; @@ -1604,63 +1608,63 @@ struct stat { typedef unsigned short ushort_t; typedef unsigned int uint_t; typedef unsigned long ulong_t; -#else +# else #include /**/ <sys/types.h> -#endif /* ACE_LACKS_SYS_TYPES_H */ +# endif /* ACE_LACKS_SYS_TYPES_H */ -#include /**/ <sys/stat.h> +# include /**/ <sys/stat.h> #endif /* ACE_HAS_WINCE */ #if defined (ACE_NEW_THROWS_EXCEPTIONS) // I know this works for HP aC++... if <stdexcept> is used, it introduces other // stuff that breaks things, like <memory>, which screws up auto_ptr. -#include /**/ <new> +# include /**/ <new> #endif /* ACE_NEW_THROWS_EXCEPTIONS */ #if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) -# include /**/ <synch.h> -# include /**/ <thread.h> -# define ACE_SCOPE_PROCESS P_PID -# define ACE_SCOPE_LWP P_LWPID -# define ACE_SCOPE_THREAD (ACE_SCOPE_LWP + 1) -# else -# define ACE_SCOPE_PROCESS 0 -# define ACE_SCOPE_LWP 1 -# define ACE_SCOPE_THREAD 2 -# endif /* ACE_HAS_STHREADS */ - -# if ! (defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS)) -# define ACE_SCHED_OTHER 0 -# define ACE_SCHED_FIFO 1 -# define ACE_SCHED_RR 2 -# endif /* ! (ACE_HAS_DCETHREADS || ACE_HAS_PTHREADS) */ - -# if defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS) -# define ACE_SCHED_OTHER SCHED_OTHER -# define ACE_SCHED_FIFO SCHED_FIFO -# define ACE_SCHED_RR SCHED_RR +# if defined (ACE_HAS_STHREADS) +# include /**/ <synch.h> +# include /**/ <thread.h> +# define ACE_SCOPE_PROCESS P_PID +# define ACE_SCOPE_LWP P_LWPID +# define ACE_SCOPE_THREAD (ACE_SCOPE_LWP + 1) +# else +# define ACE_SCOPE_PROCESS 0 +# define ACE_SCOPE_LWP 1 +# define ACE_SCOPE_THREAD 2 +# endif /* ACE_HAS_STHREADS */ + +# if ! (defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS)) +# define ACE_SCHED_OTHER 0 +# define ACE_SCHED_FIFO 1 +# define ACE_SCHED_RR 2 +# endif /* ! (ACE_HAS_DCETHREADS || ACE_HAS_PTHREADS) */ + +# if defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS) +# define ACE_SCHED_OTHER SCHED_OTHER +# define ACE_SCHED_FIFO SCHED_FIFO +# define ACE_SCHED_RR SCHED_RR // Definitions for mapping POSIX pthreads onto Solaris threads. -# if defined (ACE_HAS_FSU_PTHREADS) -# define PTHREAD_DETACHED 0x1 -# define PTHREAD_SCOPE_SYSTEM 0x2 -# define PTHREAD_INHERIT_SCHED 0x4 -# define PTHREAD_NOFLOAT 0x8 -# define PTHREAD_CREATE_UNDETACHED 0 -# define PTHREAD_CREATE_DETACHED PTHREAD_DETACHED -# define PTHREAD_CREATE_JOINABLE 0 -# define PTHREAD_SCOPE_PROCESS 0 -# define PTHREAD_EXPLICIT_SCHED 0 -# define PTHREAD_MIN_PRIORITY 0 -# define PTHREAD_MAX_PRIORITY 126 -# endif /* ACE_HAS_FSU_PTHREADS */ - -# if defined (ACE_HAS_DCETHREADS) && !defined (ACE_HAS_DCE_DRAFT4_THREADS) -# define PRIORITY_MAX PTHREAD_MAX_PRIORITY -# endif /* ACE_HAS_DCETHREADS */ +# if defined (ACE_HAS_FSU_PTHREADS) +# define PTHREAD_DETACHED 0x1 +# define PTHREAD_SCOPE_SYSTEM 0x2 +# define PTHREAD_INHERIT_SCHED 0x4 +# define PTHREAD_NOFLOAT 0x8 +# define PTHREAD_CREATE_UNDETACHED 0 +# define PTHREAD_CREATE_DETACHED PTHREAD_DETACHED +# define PTHREAD_CREATE_JOINABLE 0 +# define PTHREAD_SCOPE_PROCESS 0 +# define PTHREAD_EXPLICIT_SCHED 0 +# define PTHREAD_MIN_PRIORITY 0 +# define PTHREAD_MAX_PRIORITY 126 +# endif /* ACE_HAS_FSU_PTHREADS */ + +# if defined (ACE_HAS_DCETHREADS) && !defined (ACE_HAS_DCE_DRAFT4_THREADS) +# define PRIORITY_MAX PTHREAD_MAX_PRIORITY +# endif /* ACE_HAS_DCETHREADS */ // Definitions for THREAD- and PROCESS-LEVEL priorities...some // implementations define these while others don't. In order to @@ -1669,159 +1673,159 @@ struct stat { // programs to have their own ACE-wide "default". // PROCESS-level values -# define ACE_PROC_PRI_FIFO_MIN (sched_get_priority_min(SCHED_FIFO)) -# define ACE_PROC_PRI_FIFO_MAX (sched_get_priority_max(SCHED_FIFO)) -# define ACE_PROC_PRI_RR_MIN (sched_get_priority_min(SCHED_RR)) -# define ACE_PROC_PRI_RR_MAX (sched_get_priority_max(SCHED_RR)) -# define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) -# define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) -# if !defined(ACE_PROC_PRI_FIFO_DEF) -# define ACE_PROC_PRI_FIFO_DEF (ACE_PROC_PRI_FIFO_MIN + (ACE_PROC_PRI_FIFO_MAX - ACE_PROC_PRI_FIFO_MIN)/2) -# endif -# if !defined(ACE_PROC_PRI_RR_DEF) -# define ACE_PROC_PRI_RR_DEF (ACE_PROC_PRI_RR_MIN + (ACE_PROC_PRI_RR_MAX - ACE_PROC_PRI_RR_MIN)/2) -# endif -# if !defined(ACE_PROC_PRI_OTHER_DEF) -# define ACE_PROC_PRI_OTHER_DEF (ACE_PROC_PRI_OTHER_MIN + (ACE_PROC_PRI_OTHER_MAX - ACE_PROC_PRI_OTHER_MIN)/2) -# endif +# define ACE_PROC_PRI_FIFO_MIN (sched_get_priority_min(SCHED_FIFO)) +# define ACE_PROC_PRI_FIFO_MAX (sched_get_priority_max(SCHED_FIFO)) +# define ACE_PROC_PRI_RR_MIN (sched_get_priority_min(SCHED_RR)) +# define ACE_PROC_PRI_RR_MAX (sched_get_priority_max(SCHED_RR)) +# define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER)) +# define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER)) +# if !defined(ACE_PROC_PRI_FIFO_DEF) +# define ACE_PROC_PRI_FIFO_DEF (ACE_PROC_PRI_FIFO_MIN + (ACE_PROC_PRI_FIFO_MAX - ACE_PROC_PRI_FIFO_MIN)/2) +# endif +# if !defined(ACE_PROC_PRI_RR_DEF) +# define ACE_PROC_PRI_RR_DEF (ACE_PROC_PRI_RR_MIN + (ACE_PROC_PRI_RR_MAX - ACE_PROC_PRI_RR_MIN)/2) +# endif +# if !defined(ACE_PROC_PRI_OTHER_DEF) +# define ACE_PROC_PRI_OTHER_DEF (ACE_PROC_PRI_OTHER_MIN + (ACE_PROC_PRI_OTHER_MAX - ACE_PROC_PRI_OTHER_MIN)/2) +# endif // THREAD-level values -# if defined(PRI_FIFO_MIN) && defined(PRI_FIFO_MAX) && defined(PRI_RR_MIN) && defined(PRI_RR_MAX) && defined(PRI_OTHER_MIN) && defined(PRI_OTHER_MAX) -# define ACE_THR_PRI_FIFO_MIN PRI_FIFO_MIN -# define ACE_THR_PRI_FIFO_MAX PRI_FIFO_MAX -# define ACE_THR_PRI_RR_MIN PRI_RR_MIN -# define ACE_THR_PRI_RR_MAX PRI_RR_MAX -# define ACE_THR_PRI_OTHER_MIN PRI_OTHER_MIN -# define ACE_THR_PRI_OTHER_MAX PRI_OTHER_MAX -# else -# define ACE_THR_PRI_FIFO_MIN ACE_PROC_PRI_FIFO_MIN -# define ACE_THR_PRI_FIFO_MAX ACE_PROC_PRI_FIFO_MAX -# define ACE_THR_PRI_RR_MIN ACE_PROC_PRI_RR_MIN -# define ACE_THR_PRI_RR_MAX ACE_PROC_PRI_RR_MAX -# define ACE_THR_PRI_OTHER_MIN ACE_PROC_PRI_OTHER_MIN -# define ACE_THR_PRI_OTHER_MAX ACE_PROC_PRI_OTHER_MAX -# endif -# if !defined(ACE_THR_PRI_FIFO_DEF) -# define ACE_THR_PRI_FIFO_DEF (ACE_THR_PRI_FIFO_MIN + (ACE_THR_PRI_FIFO_MAX - ACE_THR_PRI_FIFO_MIN)/2) -# endif -# if !defined(ACE_THR_PRI_RR_DEF) -# define ACE_THR_PRI_RR_DEF (ACE_THR_PRI_RR_MIN + (ACE_THR_PRI_RR_MAX - ACE_THR_PRI_RR_MIN)/2) -# endif -# if !defined(ACE_THR_PRI_OTHER_DEF) -# define ACE_THR_PRI_OTHER_DEF (ACE_THR_PRI_OTHER_MIN + (ACE_THR_PRI_OTHER_MAX - ACE_THR_PRI_OTHER_MIN)/2) -# endif - -# if !defined (ACE_HAS_TID_T) +# if defined(PRI_FIFO_MIN) && defined(PRI_FIFO_MAX) && defined(PRI_RR_MIN) && defined(PRI_RR_MAX) && defined(PRI_OTHER_MIN) && defined(PRI_OTHER_MAX) +# define ACE_THR_PRI_FIFO_MIN PRI_FIFO_MIN +# define ACE_THR_PRI_FIFO_MAX PRI_FIFO_MAX +# define ACE_THR_PRI_RR_MIN PRI_RR_MIN +# define ACE_THR_PRI_RR_MAX PRI_RR_MAX +# define ACE_THR_PRI_OTHER_MIN PRI_OTHER_MIN +# define ACE_THR_PRI_OTHER_MAX PRI_OTHER_MAX +# else +# define ACE_THR_PRI_FIFO_MIN ACE_PROC_PRI_FIFO_MIN +# define ACE_THR_PRI_FIFO_MAX ACE_PROC_PRI_FIFO_MAX +# define ACE_THR_PRI_RR_MIN ACE_PROC_PRI_RR_MIN +# define ACE_THR_PRI_RR_MAX ACE_PROC_PRI_RR_MAX +# define ACE_THR_PRI_OTHER_MIN ACE_PROC_PRI_OTHER_MIN +# define ACE_THR_PRI_OTHER_MAX ACE_PROC_PRI_OTHER_MAX +# endif +# if !defined(ACE_THR_PRI_FIFO_DEF) +# define ACE_THR_PRI_FIFO_DEF (ACE_THR_PRI_FIFO_MIN + (ACE_THR_PRI_FIFO_MAX - ACE_THR_PRI_FIFO_MIN)/2) +# endif +# if !defined(ACE_THR_PRI_RR_DEF) +# define ACE_THR_PRI_RR_DEF (ACE_THR_PRI_RR_MIN + (ACE_THR_PRI_RR_MAX - ACE_THR_PRI_RR_MIN)/2) +# endif +# if !defined(ACE_THR_PRI_OTHER_DEF) +# define ACE_THR_PRI_OTHER_DEF (ACE_THR_PRI_OTHER_MIN + (ACE_THR_PRI_OTHER_MAX - ACE_THR_PRI_OTHER_MIN)/2) +# endif + +# if !defined (ACE_HAS_TID_T) typedef pthread_t tid_t; -# endif /* ACE_HAS_TID_T */ +# endif /* ACE_HAS_TID_T */ // Typedefs to help compatibility with Windows NT and Pthreads. -# if defined (ACE_HAS_PTHREAD_T) +# if defined (ACE_HAS_PTHREAD_T) typedef pthread_t ACE_hthread_t; -# else /* ACE_HAS_PTHREAD_T */ +# else /* ACE_HAS_PTHREAD_T */ typedef tid_t ACE_hthread_t; -# endif /* ACE_HAS_PTHREAD_T */ +# endif /* ACE_HAS_PTHREAD_T */ // Make it easier to write portable thread code. typedef pthread_t ACE_thread_t; typedef pthread_key_t ACE_thread_key_t; -#if !defined (ACE_LACKS_COND_T) +# if !defined (ACE_LACKS_COND_T) typedef pthread_mutex_t ACE_mutex_t; typedef pthread_cond_t ACE_cond_t; -#endif /* ! ACE_LACKS_COND_T */ +# endif /* ! ACE_LACKS_COND_T */ typedef pthread_mutex_t ACE_thread_mutex_t; -# if !defined (PTHREAD_CANCEL_DISABLE) -# define PTHREAD_CANCEL_DISABLE 0 -# endif /* PTHREAD_CANCEL_DISABLE */ - -# if !defined (PTHREAD_CANCEL_ENABLE) -# define PTHREAD_CANCEL_ENABLE 0 -# endif /* PTHREAD_CANCEL_ENABLE */ - -# if !defined (PTHREAD_CANCEL_DEFERRED) -# define PTHREAD_CANCEL_DEFERRED 0 -# endif /* PTHREAD_CANCEL_DEFERRED */ - -# if !defined (PTHREAD_CANCEL_ASYNCHRONOUS) -# define PTHREAD_CANCEL_ASYNCHRONOUS 0 -# endif /* PTHREAD_CANCEL_ASYNCHRONOUS */ - -# define THR_CANCEL_DISABLE PTHREAD_CANCEL_DISABLE -# define THR_CANCEL_ENABLE PTHREAD_CANCEL_ENABLE -# define THR_CANCEL_DEFERRED PTHREAD_CANCEL_DEFERRED -# define THR_CANCEL_ASYNCHRONOUS PTHREAD_CANCEL_ASYNCHRONOUS - -# if !defined (PTHREAD_CREATE_JOINABLE) -# if defined (PTHREAD_CREATE_UNDETACHED) -# define PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED -# else -# define PTHREAD_CREATE_JOINABLE 0 -# endif /* PTHREAD_CREATE_UNDETACHED */ -# endif /* PTHREAD_CREATE_JOINABLE */ - -# if !defined (PTHREAD_CREATE_DETACHED) -# define PTHREAD_CREATE_DETACHED 1 -# endif /* PTHREAD_CREATE_DETACHED */ - -# if !defined (PTHREAD_PROCESS_PRIVATE) -# if defined (PTHREAD_MUTEXTYPE_FAST) -# define PTHREAD_PROCESS_PRIVATE PTHREAD_MUTEXTYPE_FAST -# else -# define PTHREAD_PROCESS_PRIVATE 0 -# endif /* PTHREAD_MUTEXTYPE_FAST */ -# endif /* PTHREAD_PROCESS_PRIVATE */ - -# if !defined (PTHREAD_PROCESS_SHARED) -# if defined (PTHREAD_MUTEXTYPE_FAST) -# define PTHREAD_PROCESS_SHARED PTHREAD_MUTEXTYPE_FAST -# else -# define PTHREAD_PROCESS_SHARED 0 -# endif /* PTHREAD_MUTEXTYPE_FAST */ -# endif /* PTHREAD_PROCESS_SHARED */ - -# if defined (ACE_HAS_DCETHREADS) -# if defined (PTHREAD_PROCESS_PRIVATE) -# define USYNC_THREAD PTHREAD_PROCESS_PRIVATE -# else -# define USYNC_THREAD MUTEX_NONRECURSIVE_NP -# endif /* PTHREAD_PROCESS_PRIVATE */ - -# if defined (PTHREAD_PROCESS_SHARED) -# define USYNC_PROCESS PTHREAD_PROCESS_SHARED -# else -# define USYNC_PROCESS MUTEX_NONRECURSIVE_NP -# endif /* PTHREAD_PROCESS_SHARED */ -# elif !defined (ACE_HAS_STHREADS) -# define USYNC_THREAD PTHREAD_PROCESS_PRIVATE -# define USYNC_PROCESS PTHREAD_PROCESS_SHARED -# endif /* ACE_HAS_DCETHREADS */ - -# define THR_BOUND 0x00000001 -# if defined (CHORUS) -# define THR_NEW_LWP 0x00000000 -# else -# define THR_NEW_LWP 0x00000002 -# endif /* CHORUS */ -# define THR_DETACHED 0x00000040 -# define THR_SUSPENDED 0x00000080 -# define THR_DAEMON 0x00000100 -# define THR_JOINABLE 0x00010000 -# define THR_SCHED_FIFO 0x00020000 -# define THR_SCHED_RR 0x00040000 -# define THR_SCHED_DEFAULT 0x00080000 -# if defined (ACE_HAS_IRIX62_THREADS) -# define THR_SCOPE_SYSTEM 0x00100000 -# else -# define THR_SCOPE_SYSTEM THR_BOUND -# endif /* ACE_HAS_IRIX62_THREADS */ -# define THR_SCOPE_PROCESS 0x00200000 -# define THR_INHERIT_SCHED 0x00400000 -# define THR_EXPLICIT_SCHED 0x00800000 -# define THR_SCHED_IO 0x01000000 - -# if !defined (ACE_HAS_STHREADS) -# if !defined (ACE_HAS_POSIX_SEM) +# if !defined (PTHREAD_CANCEL_DISABLE) +# define PTHREAD_CANCEL_DISABLE 0 +# endif /* PTHREAD_CANCEL_DISABLE */ + +# if !defined (PTHREAD_CANCEL_ENABLE) +# define PTHREAD_CANCEL_ENABLE 0 +# endif /* PTHREAD_CANCEL_ENABLE */ + +# if !defined (PTHREAD_CANCEL_DEFERRED) +# define PTHREAD_CANCEL_DEFERRED 0 +# endif /* PTHREAD_CANCEL_DEFERRED */ + +# if !defined (PTHREAD_CANCEL_ASYNCHRONOUS) +# define PTHREAD_CANCEL_ASYNCHRONOUS 0 +# endif /* PTHREAD_CANCEL_ASYNCHRONOUS */ + +# define THR_CANCEL_DISABLE PTHREAD_CANCEL_DISABLE +# define THR_CANCEL_ENABLE PTHREAD_CANCEL_ENABLE +# define THR_CANCEL_DEFERRED PTHREAD_CANCEL_DEFERRED +# define THR_CANCEL_ASYNCHRONOUS PTHREAD_CANCEL_ASYNCHRONOUS + +# if !defined (PTHREAD_CREATE_JOINABLE) +# if defined (PTHREAD_CREATE_UNDETACHED) +# define PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED +# else +# define PTHREAD_CREATE_JOINABLE 0 +# endif /* PTHREAD_CREATE_UNDETACHED */ +# endif /* PTHREAD_CREATE_JOINABLE */ + +# if !defined (PTHREAD_CREATE_DETACHED) +# define PTHREAD_CREATE_DETACHED 1 +# endif /* PTHREAD_CREATE_DETACHED */ + +# if !defined (PTHREAD_PROCESS_PRIVATE) +# if defined (PTHREAD_MUTEXTYPE_FAST) +# define PTHREAD_PROCESS_PRIVATE PTHREAD_MUTEXTYPE_FAST +# else +# define PTHREAD_PROCESS_PRIVATE 0 +# endif /* PTHREAD_MUTEXTYPE_FAST */ +# endif /* PTHREAD_PROCESS_PRIVATE */ + +# if !defined (PTHREAD_PROCESS_SHARED) +# if defined (PTHREAD_MUTEXTYPE_FAST) +# define PTHREAD_PROCESS_SHARED PTHREAD_MUTEXTYPE_FAST +# else +# define PTHREAD_PROCESS_SHARED 0 +# endif /* PTHREAD_MUTEXTYPE_FAST */ +# endif /* PTHREAD_PROCESS_SHARED */ + +# if defined (ACE_HAS_DCETHREADS) +# if defined (PTHREAD_PROCESS_PRIVATE) +# define USYNC_THREAD PTHREAD_PROCESS_PRIVATE +# else +# define USYNC_THREAD MUTEX_NONRECURSIVE_NP +# endif /* PTHREAD_PROCESS_PRIVATE */ + +# if defined (PTHREAD_PROCESS_SHARED) +# define USYNC_PROCESS PTHREAD_PROCESS_SHARED +# else +# define USYNC_PROCESS MUTEX_NONRECURSIVE_NP +# endif /* PTHREAD_PROCESS_SHARED */ +# elif !defined (ACE_HAS_STHREADS) +# define USYNC_THREAD PTHREAD_PROCESS_PRIVATE +# define USYNC_PROCESS PTHREAD_PROCESS_SHARED +# endif /* ACE_HAS_DCETHREADS */ + +# define THR_BOUND 0x00000001 +# if defined (CHORUS) +# define THR_NEW_LWP 0x00000000 +# else +# define THR_NEW_LWP 0x00000002 +# endif /* CHORUS */ +# define THR_DETACHED 0x00000040 +# define THR_SUSPENDED 0x00000080 +# define THR_DAEMON 0x00000100 +# define THR_JOINABLE 0x00010000 +# define THR_SCHED_FIFO 0x00020000 +# define THR_SCHED_RR 0x00040000 +# define THR_SCHED_DEFAULT 0x00080000 +# if defined (ACE_HAS_IRIX62_THREADS) +# define THR_SCOPE_SYSTEM 0x00100000 +# else +# define THR_SCOPE_SYSTEM THR_BOUND +# endif /* ACE_HAS_IRIX62_THREADS */ +# define THR_SCOPE_PROCESS 0x00200000 +# define THR_INHERIT_SCHED 0x00400000 +# define THR_EXPLICIT_SCHED 0x00800000 +# define THR_SCHED_IO 0x01000000 + +# if !defined (ACE_HAS_STHREADS) +# if !defined (ACE_HAS_POSIX_SEM) // This is used to implement semaphores for POSIX pthreads, but // without POSIX semaphores. It is different than the POSIX sem_t. class ACE_Export ACE_sema_t @@ -1840,54 +1844,54 @@ protected: u_long waiters_; // Number of threads that have called <ACE_OS::sema_wait>. }; -# endif /* !ACE_HAS_POSIX_SEM */ - -#if defined (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) -#if defined (USYNC_THREAD) -#undef USYNC_THREAD -#endif /* USYNC_THREAD */ -#if defined (USYNC_PROCESS) -#undef USYNC_PROCESS -#endif /* USYNC_PROCESS */ -# include /**/ <thread.h> -#endif /* defined (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) */ - -# else +# endif /* !ACE_HAS_POSIX_SEM */ + +# if defined (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) +# if defined (USYNC_THREAD) +# undef USYNC_THREAD +# endif /* USYNC_THREAD */ +# if defined (USYNC_PROCESS) +# undef USYNC_PROCESS +# endif /* USYNC_PROCESS */ +# include /**/ <thread.h> +# endif /* defined (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) */ + +# else // If we are on Solaris we can just reuse the existing implementations // of these synchronization types. -#if !defined (ACE_LACKS_RWLOCK_T) +# if !defined (ACE_LACKS_RWLOCK_T) typedef rwlock_t ACE_rwlock_t; -#endif /* !ACE_LACKS_RWLOCK_T */ -# if !defined (ACE_HAS_POSIX_SEM) +# endif /* !ACE_LACKS_RWLOCK_T */ +# if !defined (ACE_HAS_POSIX_SEM) typedef sema_t ACE_sema_t; -# endif /* !ACE_HAS_POSIX_SEM */ -# endif /* !ACE_HAS_STHREADS */ -#elif defined (ACE_HAS_STHREADS) +# endif /* !ACE_HAS_POSIX_SEM */ +# endif /* !ACE_HAS_STHREADS */ +# elif defined (ACE_HAS_STHREADS) // Solaris threads, without PTHREADS. // Typedefs to help compatibility with Windows NT and Pthreads. typedef thread_t ACE_thread_t; typedef thread_key_t ACE_thread_key_t; typedef mutex_t ACE_mutex_t; -#if !defined (ACE_LACKS_RWLOCK_T) +# if !defined (ACE_LACKS_RWLOCK_T) typedef rwlock_t ACE_rwlock_t; -#endif /* !ACE_LACKS_RWLOCK_T */ -# if !defined (ACE_HAS_POSIX_SEM) +# endif /* !ACE_LACKS_RWLOCK_T */ +# if !defined (ACE_HAS_POSIX_SEM) typedef sema_t ACE_sema_t; -# endif /* !ACE_HAS_POSIX_SEM */ +# endif /* !ACE_HAS_POSIX_SEM */ typedef cond_t ACE_cond_t; typedef ACE_thread_t ACE_hthread_t; typedef ACE_mutex_t ACE_thread_mutex_t; -# define THR_CANCEL_DISABLE 0 -# define THR_CANCEL_ENABLE 0 -# define THR_CANCEL_DEFERRED 0 -# define THR_CANCEL_ASYNCHRONOUS 0 -# define THR_JOINABLE 0 -# define THR_SCHED_FIFO 0 -# define THR_SCHED_RR 0 -# define THR_SCHED_DEFAULT 0 +# define THR_CANCEL_DISABLE 0 +# define THR_CANCEL_ENABLE 0 +# define THR_CANCEL_DEFERRED 0 +# define THR_CANCEL_ASYNCHRONOUS 0 +# define THR_JOINABLE 0 +# define THR_SCHED_FIFO 0 +# define THR_SCHED_RR 0 +# define THR_SCHED_DEFAULT 0 -#elif defined (ACE_PSOS) +# elif defined (ACE_PSOS) // implement ACE_thread_mutex_t and ACE_mutex_t using pSOS semaphores typedef u_long ACE_mutex_t; @@ -1904,23 +1908,23 @@ typedef int ACE_hthread_t; typedef u_int ACE_thread_key_t; /* CDG - TBD - revisit these: compare pthreads and pSOS threads */ -# define THR_CANCEL_DISABLE 0 /* thread can never be cancelled */ -# define THR_CANCEL_ENABLE 0 /* thread can be cancelled */ -# define THR_CANCEL_DEFERRED 0 /* cancellation deferred to cancellation point */ -# define THR_CANCEL_ASYNCHRONOUS 0 /* cancellation occurs immediately */ - -# define THR_BOUND 0 -# define THR_NEW_LWP 0 -# define THR_DETACHED 0 -# define THR_SUSPENDED 0 -# define THR_DAEMON 0 -# define THR_JOINABLE 0 - -# define THR_SCHED_FIFO 0 -# define THR_SCHED_RR 0 -# define THR_SCHED_DEFAULT 0 -# define USYNC_THREAD T_LOCAL -# define USYNC_PROCESS T_GLOBAL +# define THR_CANCEL_DISABLE 0 /* thread can never be cancelled */ +# define THR_CANCEL_ENABLE 0 /* thread can be cancelled */ +# define THR_CANCEL_DEFERRED 0 /* cancellation deferred to cancellation point */ +# define THR_CANCEL_ASYNCHRONOUS 0 /* cancellation occurs immediately */ + +# define THR_BOUND 0 +# define THR_NEW_LWP 0 +# define THR_DETACHED 0 +# define THR_SUSPENDED 0 +# define THR_DAEMON 0 +# define THR_JOINABLE 0 + +# define THR_SCHED_FIFO 0 +# define THR_SCHED_RR 0 +# define THR_SCHED_DEFAULT 0 +# define USYNC_THREAD T_LOCAL +# define USYNC_PROCESS T_GLOBAL /* from psos.h */ /* #define T_NOPREEMPT 0x00000001 Not preemptible bit */ @@ -1963,21 +1967,21 @@ protected: }; -#elif defined (VXWORKS) +# elif defined (VXWORKS) // For mutex implementation using mutual-exclusion semaphores (which // can be taken recursively). -# include /**/ <semLib.h> - -# include /**/ <envLib.h> -# include /**/ <hostLib.h> -# include /**/ <ioLib.h> -# include /**/ <remLib.h> -# include /**/ <selectLib.h> -# include /**/ <sigLib.h> -# include /**/ <sockLib.h> -# include /**/ <sysLib.h> -# include /**/ <taskLib.h> -# include /**/ <taskHookLib.h> +# include /**/ <semLib.h> + +# include /**/ <envLib.h> +# include /**/ <hostLib.h> +# include /**/ <ioLib.h> +# include /**/ <remLib.h> +# include /**/ <selectLib.h> +# include /**/ <sigLib.h> +# include /**/ <sockLib.h> +# include /**/ <sysLib.h> +# include /**/ <taskLib.h> +# include /**/ <taskHookLib.h> extern "C" struct sockaddr_un { @@ -1985,45 +1989,45 @@ struct sockaddr_un { char sun_path[108]; // path name. }; -#define MAXPATHLEN 1024 -#define MAXNAMLEN 255 -#define NSIG (_NSIGS + 1) +# define MAXPATHLEN 1024 +# define MAXNAMLEN 255 +# define NSIG (_NSIGS + 1) // task options: the other options are either obsolete, internal, or for // Fortran or Ada support -# define VX_UNBREAKABLE 0x0002 /* breakpoints ignored */ -# define VX_FP_TASK 0x0008 /* floating point coprocessor */ -# define VX_PRIVATE_ENV 0x0080 /* private environment support */ -# define VX_NO_STACK_FILL 0x0100 /* do not stack fill for checkstack () */ - -# define THR_CANCEL_DISABLE 0 -# define THR_CANCEL_ENABLE 0 -# define THR_CANCEL_DEFERRED 0 -# define THR_CANCEL_ASYNCHRONOUS 0 -# define THR_BOUND 0 -# define THR_NEW_LWP 0 -# define THR_DETACHED 0 -# define THR_SUSPENDED 0 -# define THR_DAEMON 0 -# define THR_JOINABLE 0 -# define THR_SCHED_FIFO 0 -# define THR_SCHED_RR 0 -# define THR_SCHED_DEFAULT 0 -# define USYNC_THREAD 0 -# define USYNC_PROCESS 1 /* it's all global on VxWorks (without MMU +# define VX_UNBREAKABLE 0x0002 /* breakpoints ignored */ +# define VX_FP_TASK 0x0008 /* floating point coprocessor */ +# define VX_PRIVATE_ENV 0x0080 /* private environment support */ +# define VX_NO_STACK_FILL 0x0100 /* do not stack fill for checkstack () */ + +# define THR_CANCEL_DISABLE 0 +# define THR_CANCEL_ENABLE 0 +# define THR_CANCEL_DEFERRED 0 +# define THR_CANCEL_ASYNCHRONOUS 0 +# define THR_BOUND 0 +# define THR_NEW_LWP 0 +# define THR_DETACHED 0 +# define THR_SUSPENDED 0 +# define THR_DAEMON 0 +# define THR_JOINABLE 0 +# define THR_SCHED_FIFO 0 +# define THR_SCHED_RR 0 +# define THR_SCHED_DEFAULT 0 +# define USYNC_THREAD 0 +# define USYNC_PROCESS 1 /* it's all global on VxWorks (without MMU option) */ -#if !defined (ACE_DEFAULT_SYNCH_TYPE) +# if !defined (ACE_DEFAULT_SYNCH_TYPE) // Types include these options: SEM_Q_PRIORITY, SEM_Q_FIFO, // SEM_DELETE_SAFE, and SEM_INVERSION_SAFE. SEM_Q_FIFO is // used as the default because that is VxWorks' default. -# define ACE_DEFAULT_SYNCH_TYPE SEM_Q_FIFO -#endif /* ! ACE_DEFAULT_SYNCH_TYPE */ +# define ACE_DEFAULT_SYNCH_TYPE SEM_Q_FIFO +# endif /* ! ACE_DEFAULT_SYNCH_TYPE */ typedef SEM_ID ACE_mutex_t; // implement ACE_thread_mutex_t with ACE_mutex_t sinces there's just one process . . . typedef ACE_mutex_t ACE_thread_mutex_t; -# if !defined (ACE_HAS_POSIX_SEM) +# if !defined (ACE_HAS_POSIX_SEM) // Use VxWorks semaphores, wrapped . . . typedef struct { @@ -2033,7 +2037,7 @@ typedef struct char *name_; // Name of the semaphore: always NULL with VxWorks. } ACE_sema_t; -# endif /* !ACE_HAS_POSIX_SEM */ +# endif /* !ACE_HAS_POSIX_SEM */ typedef char * ACE_thread_t; typedef int ACE_hthread_t; // Key type: the ACE TSS emulation requires the key type be unsigned, @@ -2041,7 +2045,7 @@ typedef int ACE_hthread_t; // use u_int, so the ACE TSS emulation is compatible with them.) typedef u_int ACE_thread_key_t; -#elif defined (ACE_HAS_WTHREADS) +# elif defined (ACE_HAS_WTHREADS) typedef CRITICAL_SECTION ACE_thread_mutex_t; typedef struct @@ -2060,9 +2064,9 @@ typedef HANDLE ACE_event_t; //@@ ACE_USES_WINCE_SEMA_SIMULATION is used to debug // semaphore simulation on WinNT. It should be // changed to ACE_USES_HAS_WINCE at some later point. -#if !defined (ACE_USES_WINCE_SEMA_SIMULATION) +# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) typedef HANDLE ACE_sema_t; -#else +# else class ACE_sema_t { @@ -2079,29 +2083,29 @@ public: // Current count of the semaphore. }; -#endif /* ACE_USES_WINCE_SEMA_SIMULATION */ +# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ // These need to be different values, neither of which can be 0... -# define USYNC_THREAD 1 -# define USYNC_PROCESS 2 - -# define THR_CANCEL_DISABLE 0 -# define THR_CANCEL_ENABLE 0 -# define THR_CANCEL_DEFERRED 0 -# define THR_CANCEL_ASYNCHRONOUS 0 -# define THR_DETACHED 0x02000000 /* ?? ignore in most places */ -# define THR_BOUND 0 /* ?? ignore in most places */ -# define THR_NEW_LWP 0 /* ?? ignore in most places */ -# define THR_DAEMON 0 /* ?? ignore in most places */ -# define THR_JOINABLE 0 /* ?? ignore in most places */ -# define THR_SUSPENDED CREATE_SUSPENDED -# define THR_USE_AFX 0x01000000 -# define THR_SCHED_FIFO 0 -# define THR_SCHED_RR 0 -# define THR_SCHED_DEFAULT 0 -#endif /* ACE_HAS_DCETHREADS || ACE_HAS_PTHREADS */ - -#if defined (ACE_LACKS_COND_T) +# define USYNC_THREAD 1 +# define USYNC_PROCESS 2 + +# define THR_CANCEL_DISABLE 0 +# define THR_CANCEL_ENABLE 0 +# define THR_CANCEL_DEFERRED 0 +# define THR_CANCEL_ASYNCHRONOUS 0 +# define THR_DETACHED 0x02000000 /* ?? ignore in most places */ +# define THR_BOUND 0 /* ?? ignore in most places */ +# define THR_NEW_LWP 0 /* ?? ignore in most places */ +# define THR_DAEMON 0 /* ?? ignore in most places */ +# define THR_JOINABLE 0 /* ?? ignore in most places */ +# define THR_SUSPENDED CREATE_SUSPENDED +# define THR_USE_AFX 0x01000000 +# define THR_SCHED_FIFO 0 +# define THR_SCHED_RR 0 +# define THR_SCHED_DEFAULT 0 +# endif /* ACE_HAS_DCETHREADS || ACE_HAS_PTHREADS */ + +# if defined (ACE_LACKS_COND_T) class ACE_Export ACE_cond_t { // = TITLE @@ -2127,26 +2131,26 @@ protected: ACE_sema_t sema_; // Queue up threads waiting for the condition to become signaled. -#if defined (VXWORKS) || defined (ACE_PSOS) +# if defined (VXWORKS) || defined (ACE_PSOS) ACE_sema_t waiters_done_; // A semaphore used by the broadcast/signal thread to wait for all // the waiting thread(s) to wake up and be released from the // semaphore. -#elif defined (ACE_WIN32) +# elif defined (ACE_WIN32) HANDLE waiters_done_; // An auto reset event used by the broadcast/signal thread to wait // for the waiting thread(s) to wake up and get a chance at the // semaphore. -#else +# else #error "SOMEONE FIX ME!" -#endif /* VXWORKS || ACE_PSOS */ +# endif /* VXWORKS || ACE_PSOS */ size_t was_broadcast_; // Keeps track of whether we were broadcasting or just signaling. }; -#endif /* ACE_LACKS_COND_T */ +# endif /* ACE_LACKS_COND_T */ -#if defined (ACE_LACKS_RWLOCK_T) +# if defined (ACE_LACKS_RWLOCK_T) struct ACE_Export ACE_rwlock_t { // = TITLE @@ -2178,10 +2182,10 @@ protected: // Value is -1 if writer has the lock, else this keeps track of the // number of readers holding the lock. }; -#elif defined (ACE_HAS_STHREADS) -#include /**/ <synch.h> +# elif defined (ACE_HAS_STHREADS) +# include /**/ <synch.h> typedef rwlock_t ACE_rwlock_t; -#endif /* ACE_LACKS_RWLOCK_T */ +# endif /* ACE_LACKS_RWLOCK_T */ // #define ACE_THR_PRI_FIFO_DEF on all threaded platforms, if not defined // above or in the individual platform config file. It should be used by @@ -2201,40 +2205,40 @@ typedef rwlock_t ACE_rwlock_t; #else /* !ACE_HAS_THREADS, i.e., the OS/platform doesn't support threading. */ // Give these things some reasonable value... -#define ACE_SCOPE_PROCESS 0 -#define ACE_SCOPE_LWP 1 -#define ACE_SCOPE_THREAD 2 -#define ACE_SCHED_OTHER 0 -#define ACE_SCHED_FIFO 1 -#define ACE_SCHED_RR 2 -#define THR_CANCEL_DISABLE 0 -#define THR_CANCEL_ENABLE 0 -#define THR_CANCEL_DEFERRED 0 -#define THR_CANCEL_ASYNCHRONOUS 0 -#define THR_JOINABLE 0 /* ?? ignore in most places */ -#define THR_DETACHED 0 /* ?? ignore in most places */ -#define THR_DAEMON 0 /* ?? ignore in most places */ -#define THR_BOUND 0 /* ?? ignore in most places */ -#define THR_NEW_LWP 0 /* ?? ignore in most places */ -#define THR_SUSPENDED 0 /* ?? ignore in most places */ -#define THR_SCHED_FIFO 0 -#define THR_SCHED_RR 0 -#define THR_SCHED_DEFAULT 0 -#define USYNC_THREAD 0 -#define USYNC_PROCESS 0 +# define ACE_SCOPE_PROCESS 0 +# define ACE_SCOPE_LWP 1 +# define ACE_SCOPE_THREAD 2 +# define ACE_SCHED_OTHER 0 +# define ACE_SCHED_FIFO 1 +# define ACE_SCHED_RR 2 +# define THR_CANCEL_DISABLE 0 +# define THR_CANCEL_ENABLE 0 +# define THR_CANCEL_DEFERRED 0 +# define THR_CANCEL_ASYNCHRONOUS 0 +# define THR_JOINABLE 0 /* ?? ignore in most places */ +# define THR_DETACHED 0 /* ?? ignore in most places */ +# define THR_DAEMON 0 /* ?? ignore in most places */ +# define THR_BOUND 0 /* ?? ignore in most places */ +# define THR_NEW_LWP 0 /* ?? ignore in most places */ +# define THR_SUSPENDED 0 /* ?? ignore in most places */ +# define THR_SCHED_FIFO 0 +# define THR_SCHED_RR 0 +# define THR_SCHED_DEFAULT 0 +# define USYNC_THREAD 0 +# define USYNC_PROCESS 0 // These are dummies needed for class OS.h typedef int ACE_cond_t; typedef int ACE_mutex_t; typedef int ACE_thread_mutex_t; -#if !defined (ACE_HAS_POSIX_SEM) && !defined (ACE_PSOS) +# if !defined (ACE_HAS_POSIX_SEM) && !defined (ACE_PSOS) typedef int ACE_sema_t; -#endif /* !ACE_HAS_POSIX_SEM */ +# endif /* !ACE_HAS_POSIX_SEM */ typedef int ACE_rwlock_t; typedef int ACE_thread_t; typedef int ACE_hthread_t; typedef u_int ACE_thread_key_t; -#if defined (ACE_PSOS) +# if defined (ACE_PSOS) // Wrapper for NT events on pSOS. class ACE_Export ACE_event_t @@ -2257,13 +2261,13 @@ protected: // Number of waiting threads. }; -#endif /* ACE_PSOS */ +# endif /* ACE_PSOS */ #endif /* ACE_HAS_THREADS */ // Standard C Library includes // NOTE: stdarg.h must be #included before stdio.h on LynxOS. -# include /**/ <stdarg.h> +#include /**/ <stdarg.h> #if !defined (ACE_HAS_WINCE) # include /**/ <assert.h> # include /**/ <stdio.h> @@ -2272,39 +2276,39 @@ protected: # include /**/ <errno.h> # include /**/ <fcntl.h> #endif /* ACE_HAS_WINCE */ -# include /**/ <limits.h> -# include /**/ <ctype.h> -# include /**/ <string.h> -# include /**/ <stdlib.h> -# include /**/ <float.h> +#include /**/ <limits.h> +#include /**/ <ctype.h> +#include /**/ <string.h> +#include /**/ <stdlib.h> +#include /**/ <float.h> #if defined (ACE_NEEDS_SCHED_H) # include /**/ <sched.h> #endif /* ACE_NEEDS_SCHED_H */ #if defined (ACE_HAS_WINCE) -#define islower iswlower -#define isdigit iswdigit +# define islower iswlower +# define isdigit iswdigit #endif /* ACE_HAS_WINCE */ // If the user wants minimum IOStream inclusion, we will just include // the forward declarations #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) // Forward declaration for streams -#include "ace/iosfwd.h" +# include "ace/iosfwd.h" #else /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ // Else they will get all the stream header files -#include "ace/streams.h" +# include "ace/streams.h" #endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ #if !defined (ACE_HAS_WINCE) -#include /**/ <fcntl.h> +# include /**/ <fcntl.h> #endif /* ACE_HAS_WINCE */ // This must come after signal.h is #included. #if defined (SCO) -#define SIGIO SIGPOLL -#include /**/ <sys/regset.h> +# define SIGIO SIGPOLL +# include /**/ <sys/regset.h> #endif /* SCO */ #if defined ACE_HAS_BYTESEX_H @@ -2313,19 +2317,19 @@ protected: #include "ace/Basic_Types.h" #if defined (ACE_HAS_SIG_MACROS) -#undef sigemptyset -#undef sigfillset -#undef sigaddset -#undef sigdelset -#undef sigismember +# undef sigemptyset +# undef sigfillset +# undef sigaddset +# undef sigdelset +# undef sigismember #endif /* ACE_HAS_SIG_MACROS */ // This must come after signal.h is #included. It's to counteract // the sigemptyset and sigfillset #defines, which only happen // when __OPTIMIZE__ is #defined (really!) on Linux. #if defined (linux) && defined (__OPTIMIZE__) -#undef sigemptyset -#undef sigfillset +# undef sigemptyset +# undef sigfillset #endif /* linux && __OPTIMIZE__ */ #if defined (ACE_HAS_BROKEN_SENDMSG) @@ -2348,7 +2352,7 @@ typedef u_int *ACE_RANDR_TYPE; #endif /* ACE_HAS_BROKEN_RANDR */ #if defined (ACE_HAS_UTIME) -#include /**/ <utime.h> +# include /**/ <utime.h> #endif /* ACE_HAS_UTIME */ #if !defined (ACE_HAS_MSG) && !defined (SCO) @@ -2371,14 +2375,14 @@ typedef void *ACE_MALLOC_T; #if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) // Prototypes for both signal() and struct sigaction are consistent.. -#if defined (ACE_HAS_SIG_C_FUNC) +# if defined (ACE_HAS_SIG_C_FUNC) extern "C" { -#endif /* ACE_HAS_SIG_C_FUNC */ +# endif /* ACE_HAS_SIG_C_FUNC */ typedef void (*ACE_SignalHandler)(int); typedef void (*ACE_SignalHandlerV)(int); -#if defined (ACE_HAS_SIG_C_FUNC) +# if defined (ACE_HAS_SIG_C_FUNC) } -#endif /* ACE_HAS_SIG_C_FUNC */ +# endif /* ACE_HAS_SIG_C_FUNC */ #elif defined (ACE_HAS_LYNXOS_SIGNALS) typedef void (*ACE_SignalHandler)(...); typedef void (*ACE_SignalHandlerV)(...); @@ -2397,11 +2401,11 @@ typedef void (*ACE_SignalHandlerV)(...); #elif defined (ACE_HAS_SVR4_SIGNAL_T) // SVR4 Signals are inconsistent (e.g., see struct sigaction).. typedef void (*ACE_SignalHandler)(int); -#if !defined (m88k) /* with SVR4_SIGNAL_T */ +# if !defined (m88k) /* with SVR4_SIGNAL_T */ typedef void (*ACE_SignalHandlerV)(void); -#else +# else typedef void (*ACE_SignalHandlerV)(int); -#endif // m88k /* with SVR4_SIGNAL_T */ +# endif // m88k /* with SVR4_SIGNAL_T */ #elif defined (ACE_WIN32) typedef void (__cdecl *ACE_SignalHandler)(int); typedef void (__cdecl *ACE_SignalHandlerV)(int); @@ -2409,160 +2413,160 @@ typedef void (__cdecl *ACE_SignalHandlerV)(int); typedef void (*ACE_SignalHandler)(int); typedef void (*ACE_SignalHandlerV)(...); #else /* This is necessary for some older broken version of cfront */ -#if defined (SIG_PF) -#define ACE_SignalHandler SIG_PF -#else +# if defined (SIG_PF) +# define ACE_SignalHandler SIG_PF +# else typedef void (*ACE_SignalHandler)(int); -#endif /* SIG_PF */ +# endif /* SIG_PF */ typedef void (*ACE_SignalHandlerV)(...); #endif /* ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES */ #if defined (BUFSIZ) -#define ACE_STREAMBUF_SIZE BUFSIZ +# define ACE_STREAMBUF_SIZE BUFSIZ #else -#define ACE_STREAMBUF_SIZE 1024 +# define ACE_STREAMBUF_SIZE 1024 #endif /* BUFSIZ */ #if defined (ACE_WIN32) // Turn off warnings for /W4 // To resume any of these warning: #pragma warning(default: 4xxx) // which should be placed after these defines -#ifndef ALL_WARNINGS +# ifndef ALL_WARNINGS // #pragma warning(disable: 4101) // unreferenced local variable -#pragma warning(disable: 4127) /* constant expression for TRACE/ASSERT */ -#pragma warning(disable: 4134) /* message map member fxn casts */ -#pragma warning(disable: 4511) /* private copy constructors are good to have */ -#pragma warning(disable: 4512) /* private operator= are good to have */ -#pragma warning(disable: 4514) /* unreferenced inlines are common */ -#pragma warning(disable: 4710) /* private constructors are disallowed */ -#pragma warning(disable: 4705) /* statement has no effect in optimized code */ +# pragma warning(disable: 4127) /* constant expression for TRACE/ASSERT */ +# pragma warning(disable: 4134) /* message map member fxn casts */ +# pragma warning(disable: 4511) /* private copy constructors are good to have */ +# pragma warning(disable: 4512) /* private operator= are good to have */ +# pragma warning(disable: 4514) /* unreferenced inlines are common */ +# pragma warning(disable: 4710) /* private constructors are disallowed */ +# pragma warning(disable: 4705) /* statement has no effect in optimized code */ // #pragma warning(disable: 4701) // local variable *may* be used without init // #pragma warning(disable: 4702) // unreachable code caused by optimizations -#pragma warning(disable: 4791) /* loss of debugging info in retail version */ +# pragma warning(disable: 4791) /* loss of debugging info in retail version */ // #pragma warning(disable: 4204) // non-constant aggregate initializer -#pragma warning(disable: 4275) /* deriving exported class from non-exported */ -#pragma warning(disable: 4251) /* using non-exported as public in exported */ -#pragma warning(disable: 4786) /* identifier was truncated to '255' characters in the browser information */ -#pragma warning(disable: 4097) /* typedef-name used as synonym for class-name */ -#endif /*!ALL_WARNINGS */ +# pragma warning(disable: 4275) /* deriving exported class from non-exported */ +# pragma warning(disable: 4251) /* using non-exported as public in exported */ +# pragma warning(disable: 4786) /* identifier was truncated to '255' characters in the browser information */ +# pragma warning(disable: 4097) /* typedef-name used as synonym for class-name */ +# endif /*!ALL_WARNINGS */ // STRICT type checking in WINDOWS.H enhances type safety for Windows // programs by using distinct types to represent all the different // HANDLES in Windows. So for example, STRICT prevents you from // mistakenly passing an HPEN to a routine expecting an HBITMAP. // Note that we only use this if we -#if defined (ACE_HAS_STRICT) && (ACE_HAS_STRICT != 0) -#if !defined (STRICT) /* may already be defined */ -#define STRICT -#endif /* !STRICT */ -#endif /* ACE_HAS_STRICT */ +# if defined (ACE_HAS_STRICT) && (ACE_HAS_STRICT != 0) +# if !defined (STRICT) /* may already be defined */ +# define STRICT +# endif /* !STRICT */ +# endif /* ACE_HAS_STRICT */ -#if !defined (ACE_HAS_WINCE) -#include /**/ <sys/timeb.h> -#endif /* ACE_HAS_WINCE */ +# if !defined (ACE_HAS_WINCE) +# include /**/ <sys/timeb.h> +# endif /* ACE_HAS_WINCE */ // The following defines are used by the ACE Name Server... -#if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) -#define ACE_DEFAULT_NAMESPACE_DIR_W L"C:\\temp" -#endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ +# if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) +# define ACE_DEFAULT_NAMESPACE_DIR_W L"C:\\temp" +# endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ -#if !defined (ACE_DEFAULT_NAMESPACE_DIR_A) -#define ACE_DEFAULT_NAMESPACE_DIR_A "C:\\temp" -#endif /* ACE_DEFAULT_NAMESPACE_DIR_A */ +# if !defined (ACE_DEFAULT_NAMESPACE_DIR_A) +# define ACE_DEFAULT_NAMESPACE_DIR_A "C:\\temp" +# endif /* ACE_DEFAULT_NAMESPACE_DIR_A */ -#if !defined (ACE_DEFAULT_LOCALNAME_A) -#define ACE_DEFAULT_LOCALNAME_A "localnames" -#endif /* ACE_DEFAULT_LOCALNAME_A */ +# if !defined (ACE_DEFAULT_LOCALNAME_A) +# define ACE_DEFAULT_LOCALNAME_A "localnames" +# endif /* ACE_DEFAULT_LOCALNAME_A */ -#if !defined (ACE_DEFAULT_LOCALNAME_W) -#define ACE_DEFAULT_LOCALNAME_W L"localnames" -#endif /* ACE_DEFAULT_LOCALNAME_W */ +# if !defined (ACE_DEFAULT_LOCALNAME_W) +# define ACE_DEFAULT_LOCALNAME_W L"localnames" +# endif /* ACE_DEFAULT_LOCALNAME_W */ -#if !defined (ACE_DEFAULT_GLOBALNAME_A) -#define ACE_DEFAULT_GLOBALNAME_A "globalnames" -#endif /* ACE_DEFAULT_GLOBALNAME_A */ +# if !defined (ACE_DEFAULT_GLOBALNAME_A) +# define ACE_DEFAULT_GLOBALNAME_A "globalnames" +# endif /* ACE_DEFAULT_GLOBALNAME_A */ -#if !defined (ACE_DEFAULT_GLOBALNAME_W) -#define ACE_DEFAULT_GLOBALNAME_W L"globalnames" -#endif /* ACE_DEFAULT_GLOBALNAME_W */ +# if !defined (ACE_DEFAULT_GLOBALNAME_W) +# define ACE_DEFAULT_GLOBALNAME_W L"globalnames" +# endif /* ACE_DEFAULT_GLOBALNAME_W */ // Need to work around odd glitches with NT. -#if !defined (ACE_MAX_DEFAULT_PORT) -#define ACE_MAX_DEFAULT_PORT 0 -#endif /* ACE_MAX_DEFAULT_PORT */ +# if !defined (ACE_MAX_DEFAULT_PORT) +# define ACE_MAX_DEFAULT_PORT 0 +# endif /* ACE_MAX_DEFAULT_PORT */ // We're on WinNT or Win95 -#define ACE_PLATFORM_A "Win32" -#define ACE_PLATFORM_EXE_SUFFIX_A ".exe" -#define ACE_PLATFORM_W L"Win32" -#define ACE_PLATFORM_EXE_SUFFIX_W L".exe" +# define ACE_PLATFORM_A "Win32" +# define ACE_PLATFORM_EXE_SUFFIX_A ".exe" +# define ACE_PLATFORM_W L"Win32" +# define ACE_PLATFORM_EXE_SUFFIX_W L".exe" // Used for ACE_MMAP_Memory_Pool -#if !defined (ACE_DEFAULT_BACKING_STORE) -#define ACE_DEFAULT_BACKING_STORE __TEXT ("C:\\temp\\ace-malloc-XXXXXX") -#endif /* ACE_DEFAULT_BACKING_STORE */ +# if !defined (ACE_DEFAULT_BACKING_STORE) +# define ACE_DEFAULT_BACKING_STORE __TEXT ("C:\\temp\\ace-malloc-XXXXXX") +# endif /* ACE_DEFAULT_BACKING_STORE */ // Used for logging -#if !defined (ACE_DEFAULT_LOGFILE) -#define ACE_DEFAULT_LOGFILE "C:\\temp\\logfile" -#endif /* ACE_DEFAULT_LOGFILE */ +# if !defined (ACE_DEFAULT_LOGFILE) +# define ACE_DEFAULT_LOGFILE "C:\\temp\\logfile" +# endif /* ACE_DEFAULT_LOGFILE */ // Used for dynamic linking -#if !defined (ACE_DEFAULT_SVC_CONF) -#define ACE_DEFAULT_SVC_CONF ".\\svc.conf" -#endif /* ACE_DEFAULT_SVC_CONF */ +# if !defined (ACE_DEFAULT_SVC_CONF) +# define ACE_DEFAULT_SVC_CONF ".\\svc.conf" +# endif /* ACE_DEFAULT_SVC_CONF */ // The following are #defines and #includes that are specific to // WIN32. -#define ACE_STDIN GetStdHandle (STD_INPUT_HANDLE) -#define ACE_STDOUT GetStdHandle (STD_OUTPUT_HANDLE) -#define ACE_STDERR GetStdHandle (STD_ERROR_HANDLE) +# define ACE_STDIN GetStdHandle (STD_INPUT_HANDLE) +# define ACE_STDOUT GetStdHandle (STD_OUTPUT_HANDLE) +# define ACE_STDERR GetStdHandle (STD_ERROR_HANDLE) // Default semaphore key and mutex name -#if !defined (ACE_DEFAULT_SEM_KEY) -#define ACE_DEFAULT_SEM_KEY "ACE_SEM_KEY" -#endif /* ACE_DEFAULT_SEM_KEY */ +# if !defined (ACE_DEFAULT_SEM_KEY) +# define ACE_DEFAULT_SEM_KEY "ACE_SEM_KEY" +# endif /* ACE_DEFAULT_SEM_KEY */ -#define ACE_INVALID_SEM_KEY 0 +# define ACE_INVALID_SEM_KEY 0 -#if defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) // @@ WinCE probably doesn't have structural exception support // But I need to double check to find this out -#define ACE_SEH_TRY if (1) -#define ACE_SEH_EXCEPT(X) while (0) -#define ACE_SEH_FINALLY if (1) -#else -#if defined(__BORLANDC__) -#define ACE_SEH_TRY try -#define ACE_SEH_FINALLY catch(...) -#else -#define ACE_SEH_TRY __try -#define ACE_SEH_FINALLY __finally -#endif /* __BORLANDC__ */ -#define ACE_SEH_EXCEPT(X) __except(X) -#endif /* ACE_HAS_WINCE */ +# define ACE_SEH_TRY if (1) +# define ACE_SEH_EXCEPT(X) while (0) +# define ACE_SEH_FINALLY if (1) +# else +# if defined(__BORLANDC__) +# define ACE_SEH_TRY try +# define ACE_SEH_FINALLY catch(...) +# else +# define ACE_SEH_TRY __try +# define ACE_SEH_FINALLY __finally +# endif /* __BORLANDC__ */ +# define ACE_SEH_EXCEPT(X) __except(X) +# endif /* ACE_HAS_WINCE */ // The "null" device on Win32. -#define ACE_DEV_NULL "nul" +# define ACE_DEV_NULL "nul" // Define the pathname separator characters for Win32 (ugh). -#define ACE_DIRECTORY_SEPARATOR_STR_A "\\" -#define ACE_DIRECTORY_SEPARATOR_STR_W L"\\" -#define ACE_DIRECTORY_SEPARATOR_CHAR_A '\\' -#define ACE_DIRECTORY_SEPARATOR_CHAR_W L'\\' -#define ACE_LD_SEARCH_PATH "PATH" -#define ACE_LD_SEARCH_PATH_SEPARATOR_STR ";" -#define ACE_DLL_SUFFIX ".dll" -#define ACE_DLL_PREFIX "" +# define ACE_DIRECTORY_SEPARATOR_STR_A "\\" +# define ACE_DIRECTORY_SEPARATOR_STR_W L"\\" +# define ACE_DIRECTORY_SEPARATOR_CHAR_A '\\' +# define ACE_DIRECTORY_SEPARATOR_CHAR_W L'\\' +# define ACE_LD_SEARCH_PATH "PATH" +# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ";" +# define ACE_DLL_SUFFIX ".dll" +# define ACE_DLL_PREFIX "" // This will help until we figure out everything: -#define NFDBITS 32 /* only used in unused functions... */ +# define NFDBITS 32 /* only used in unused functions... */ // These two may be used for internal flags soon: -#define MAP_PRIVATE 1 -#define MAP_SHARED 2 -#define MAP_FIXED 4 +# define MAP_PRIVATE 1 +# define MAP_SHARED 2 +# define MAP_FIXED 4 -#define RUSAGE_SELF 1 +# define RUSAGE_SELF 1 struct shmaddr { }; struct msqid_ds {}; @@ -2576,9 +2580,9 @@ struct rusage }; // MMAP flags -#define PROT_READ PAGE_READONLY -#define PROT_WRITE PAGE_READWRITE -#define PROT_RDWR PAGE_READWRITE +# define PROT_READ PAGE_READONLY +# define PROT_WRITE PAGE_READWRITE +# define PROT_RDWR PAGE_READWRITE /* If we can find suitable use for these flags, here they are: PAGE_WRITECOPY PAGE_EXECUTE @@ -2589,90 +2593,90 @@ PAGE_GUARD PAGE_NOACCESS PAGE_NOCACHE */ -#if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) -#include "ace/ws2tcpip.h" -#endif /* ACE_HAS_WINSOCK2 */ +# if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) +# include "ace/ws2tcpip.h" +# endif /* ACE_HAS_WINSOCK2 */ -#define MAXHOSTNAMELEN 256 +# define MAXHOSTNAMELEN 256 // error code mapping -#define ETIME ERROR_SEM_TIMEOUT -#define EWOULDBLOCK WSAEWOULDBLOCK -#define EINPROGRESS WSAEINPROGRESS -#define EALREADY WSAEALREADY -#define ENOTSOCK WSAENOTSOCK -#define EDESTADDRREQ WSAEDESTADDRREQ -#define EMSGSIZE WSAEMSGSIZE -#define EPROTOTYPE WSAEPROTOTYPE -#define ENOPROTOOPT WSAENOPROTOOPT -#define EPROTONOSUPPORT WSAEPROTONOSUPPORT -#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT -#define EOPNOTSUPP WSAEOPNOTSUPP -#define EPFNOSUPPORT WSAEPFNOSUPPORT -#define EAFNOSUPPORT WSAEAFNOSUPPORT -#define EADDRINUSE WSAEADDRINUSE -#define EADDRNOTAVAIL WSAEADDRNOTAVAIL -#define ENETDOWN WSAENETDOWN -#define ENETUNREACH WSAENETUNREACH -#define ENETRESET WSAENETRESET -#define ECONNABORTED WSAECONNABORTED -#define ECONNRESET WSAECONNRESET -#define ENOBUFS WSAENOBUFS -#define EISCONN WSAEISCONN -#define ENOTCONN WSAENOTCONN -#define ESHUTDOWN WSAESHUTDOWN -#define ETOOMANYREFS WSAETOOMANYREFS -#define ETIMEDOUT WSAETIMEDOUT -#define ECONNREFUSED WSAECONNREFUSED -#define ELOOP WSAELOOP -#define EHOSTDOWN WSAEHOSTDOWN -#define EHOSTUNREACH WSAEHOSTUNREACH -#define EPROCLIM WSAEPROCLIM -#define EUSERS WSAEUSERS -#define EDQUOT WSAEDQUOT -#define ESTALE WSAESTALE -#define EREMOTE WSAEREMOTE +# define ETIME ERROR_SEM_TIMEOUT +# define EWOULDBLOCK WSAEWOULDBLOCK +# define EINPROGRESS WSAEINPROGRESS +# define EALREADY WSAEALREADY +# define ENOTSOCK WSAENOTSOCK +# define EDESTADDRREQ WSAEDESTADDRREQ +# define EMSGSIZE WSAEMSGSIZE +# define EPROTOTYPE WSAEPROTOTYPE +# define ENOPROTOOPT WSAENOPROTOOPT +# define EPROTONOSUPPORT WSAEPROTONOSUPPORT +# define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT +# define EOPNOTSUPP WSAEOPNOTSUPP +# define EPFNOSUPPORT WSAEPFNOSUPPORT +# define EAFNOSUPPORT WSAEAFNOSUPPORT +# define EADDRINUSE WSAEADDRINUSE +# define EADDRNOTAVAIL WSAEADDRNOTAVAIL +# define ENETDOWN WSAENETDOWN +# define ENETUNREACH WSAENETUNREACH +# define ENETRESET WSAENETRESET +# define ECONNABORTED WSAECONNABORTED +# define ECONNRESET WSAECONNRESET +# define ENOBUFS WSAENOBUFS +# define EISCONN WSAEISCONN +# define ENOTCONN WSAENOTCONN +# define ESHUTDOWN WSAESHUTDOWN +# define ETOOMANYREFS WSAETOOMANYREFS +# define ETIMEDOUT WSAETIMEDOUT +# define ECONNREFUSED WSAECONNREFUSED +# define ELOOP WSAELOOP +# define EHOSTDOWN WSAEHOSTDOWN +# define EHOSTUNREACH WSAEHOSTUNREACH +# define EPROCLIM WSAEPROCLIM +# define EUSERS WSAEUSERS +# define EDQUOT WSAEDQUOT +# define ESTALE WSAESTALE +# define EREMOTE WSAEREMOTE // Grrr! These two are already defined by the horrible 'standard' // library. // #define ENAMETOOLONG WSAENAMETOOLONG // #define ENOTEMPTY WSAENOTEMPTY -#if !defined (ACE_HAS_WINCE) -#include /**/ <time.h> -#include /**/ <direct.h> -#include /**/ <process.h> -#include /**/ <io.h> -#endif /* ACE_HAS_WINCE */ - -#if defined (__BORLANDC__) -#include /**/ <fcntl.h> -#define _chdir chdir -#define _ftime ftime -#define _access access -#define _getcwd getcwd -#define _isatty isatty -#define _umask umask -#define _fstat fstat -#define _stat stat -#define _stricmp stricmp -#define _strnicmp strnicmp - -#define _timeb timeb - -#define _O_CREAT O_CREAT -#define _O_EXCL O_EXCL -#define _O_TRUNC O_TRUNC -#define _O_TEMPORARY 0x0800 // see fcntl.h -#endif /* __BORLANDC__ */ +# if !defined (ACE_HAS_WINCE) +# include /**/ <time.h> +# include /**/ <direct.h> +# include /**/ <process.h> +# include /**/ <io.h> +# endif /* ACE_HAS_WINCE */ + +# if defined (__BORLANDC__) +# include /**/ <fcntl.h> +# define _chdir chdir +# define _ftime ftime +# define _access access +# define _getcwd getcwd +# define _isatty isatty +# define _umask umask +# define _fstat fstat +# define _stat stat +# define _stricmp stricmp +# define _strnicmp strnicmp + +# define _timeb timeb + +# define _O_CREAT O_CREAT +# define _O_EXCL O_EXCL +# define _O_TRUNC O_TRUNC +# define _O_TEMPORARY 0x0800 // see fcntl.h +# endif /* __BORLANDC__ */ typedef OVERLAPPED ACE_OVERLAPPED; typedef DWORD ACE_thread_t; typedef HANDLE ACE_hthread_t; typedef long pid_t; typedef DWORD ACE_thread_key_t; -#if !defined (__BORLANDC__) +# if !defined (__BORLANDC__) typedef DWORD nlink_t; -#endif /* __BORLANDC__ */ +# endif /* __BORLANDC__ */ // 64-bit quad-word definitions. typedef unsigned __int64 ACE_QWORD; @@ -2684,11 +2688,11 @@ inline DWORD ACE_HIGH_DWORD (ACE_QWORD q) { return (DWORD) (q >> 32); } // Win32 dummies to help compilation. -#if !defined (__BORLANDC__) +# if !defined (__BORLANDC__) typedef int mode_t; typedef int uid_t; typedef int gid_t; -#endif /* __BORLANDC__ */ +# endif /* __BORLANDC__ */ typedef char *caddr_t; struct rlimit { }; struct t_call { }; @@ -2706,21 +2710,21 @@ typedef HANDLE ACE_HANDLE; // For Win32 compatibility. typedef SOCKET ACE_SOCKET; -#define ACE_INVALID_HANDLE INVALID_HANDLE_VALUE -#define ACE_SYSCALL_FAILED 0xFFFFFFFF +# define ACE_INVALID_HANDLE INVALID_HANDLE_VALUE +# define ACE_SYSCALL_FAILED 0xFFFFFFFF // Needed to map calls to NT transparently. -#define MS_ASYNC 0 -#define MS_INVALIDATE 0 +# define MS_ASYNC 0 +# define MS_INVALIDATE 0 // Reliance on CRT - I don't really like this. -#define O_NDELAY 0 -#if !defined (MAXPATHLEN) -#define MAXPATHLEN _MAX_PATH -#endif /* !MAXPATHLEN */ -#define MAXNAMLEN _MAX_FNAME -#define EADDRINUSE WSAEADDRINUSE +# define O_NDELAY 0 +# if !defined (MAXPATHLEN) +# define MAXPATHLEN _MAX_PATH +# endif /* !MAXPATHLEN */ +# define MAXNAMLEN _MAX_FNAME +# define EADDRINUSE WSAEADDRINUSE struct iovec { @@ -2730,13 +2734,13 @@ struct iovec typedef int ACE_idtype_t; typedef DWORD ACE_id_t; -#define ACE_SELF (-1) +# define ACE_SELF (-1) typedef int ACE_pri_t; // Dynamic loading-related types - used for dlopen and family. -#if !defined(RTLD_LAZY) -# define RTLD_LAZY 1 -#endif /* !RTLD_LAZY */ +# if !defined(RTLD_LAZY) +# define RTLD_LAZY 1 +# endif /* !RTLD_LAZY */ typedef HINSTANCE ACE_SHLIB_HANDLE; const int ACE_DEFAULT_SHLIB_MODE = 0; @@ -2751,124 +2755,124 @@ typedef const char *LPCTSTR; typedef char *LPTSTR; typedef char TCHAR; -#if !defined (__TEXT) -#if (defined (ACE_HAS_UNICODE) && (defined (UNICODE))) -#define __TEXT(STRING) L##STRING -#else -#define __TEXT(STRING) STRING -#endif /* UNICODE && ACE_HAS_UNICODE */ -#endif /* !defined __TEXT */ +# if !defined (__TEXT) +# if (defined (ACE_HAS_UNICODE) && (defined (UNICODE))) +# define __TEXT(STRING) L##STRING +# else +# define __TEXT(STRING) STRING +# endif /* UNICODE && ACE_HAS_UNICODE */ +# endif /* !defined __TEXT */ -#if defined (m88k) -#define RUSAGE_SELF 1 -#endif /* m88k */ +# if defined (m88k) +# define RUSAGE_SELF 1 +# endif /* m88k */ // Default port is MAX_SHORT. -#define ACE_MAX_DEFAULT_PORT 65535 +# define ACE_MAX_DEFAULT_PORT 65535 // Default semaphore key -#if !defined (ACE_DEFAULT_SEM_KEY) -#define ACE_DEFAULT_SEM_KEY 1234 -#endif /* ACE_DEFAULT_SEM_KEY */ +# if !defined (ACE_DEFAULT_SEM_KEY) +# define ACE_DEFAULT_SEM_KEY 1234 +# endif /* ACE_DEFAULT_SEM_KEY */ -#define ACE_INVALID_SEM_KEY -1 +# define ACE_INVALID_SEM_KEY -1 // Define the pathname separator characters for UNIX. -#define ACE_DIRECTORY_SEPARATOR_STR_A "/" -#define ACE_DIRECTORY_SEPARATOR_CHAR_A '/' +# define ACE_DIRECTORY_SEPARATOR_STR_A "/" +# define ACE_DIRECTORY_SEPARATOR_CHAR_A '/' // We're some kind of UNIX... -#define ACE_PLATFORM_A "UNIX" -#define ACE_PLATFORM_EXE_SUFFIX_A "" +# define ACE_PLATFORM_A "UNIX" +# define ACE_PLATFORM_EXE_SUFFIX_A "" + +# if defined (ACE_HAS_UNICODE) +# define ACE_DIRECTORY_SEPARATOR_STR_W L"/" +# define ACE_DIRECTORY_SEPARATOR_CHAR_W L'/' +# define ACE_PLATFORM_W L"UNIX" +# define ACE_PLATFORM_EXE_SUFFIX_W L"" +# else +# define ACE_DIRECTORY_SEPARATOR_STR_W "/" +# define ACE_DIRECTORY_SEPARATOR_CHAR_W '/' +# define ACE_PLATFORM_W "UNIX" +# define ACE_PLATFORM_EXE_SUFFIX_W "" +# endif /* ACE_HAS_UNICODE */ -#if defined (ACE_HAS_UNICODE) -#define ACE_DIRECTORY_SEPARATOR_STR_W L"/" -#define ACE_DIRECTORY_SEPARATOR_CHAR_W L'/' -#define ACE_PLATFORM_W L"UNIX" -#define ACE_PLATFORM_EXE_SUFFIX_W L"" -#else -#define ACE_DIRECTORY_SEPARATOR_STR_W "/" -#define ACE_DIRECTORY_SEPARATOR_CHAR_W '/' -#define ACE_PLATFORM_W "UNIX" -#define ACE_PLATFORM_EXE_SUFFIX_W "" -#endif /* ACE_HAS_UNICODE */ +# define ACE_LD_SEARCH_PATH "LD_LIBRARY_PATH" +# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ":" -#define ACE_LD_SEARCH_PATH "LD_LIBRARY_PATH" -#define ACE_LD_SEARCH_PATH_SEPARATOR_STR ":" - -#if defined (__hpux) -#define ACE_DLL_SUFFIX ".sl" -#else -#define ACE_DLL_SUFFIX ".so" -#endif /* __hpux */ -#define ACE_DLL_PREFIX "lib" +# if defined (__hpux) +# define ACE_DLL_SUFFIX ".sl" +# else +# define ACE_DLL_SUFFIX ".so" +# endif /* __hpux */ +# define ACE_DLL_PREFIX "lib" // The following 3 defines are used by the ACE Name Server... -#if !defined (ACE_DEFAULT_NAMESPACE_DIR_A) -#define ACE_DEFAULT_NAMESPACE_DIR_A "/tmp" -#endif /* ACE_DEFAULT_NAMESPACE_DIR_A */ - -#if !defined (ACE_DEFAULT_LOCALNAME_A) -#define ACE_DEFAULT_LOCALNAME_A "localnames" -#endif /* ACE_DEFAULT_LOCALNAME_A */ - -#if !defined (ACE_DEFAULT_GLOBALNAME_A) -#define ACE_DEFAULT_GLOBALNAME_A "globalnames" -#endif /* ACE_DEFAULT_GLOBALNAME_A */ - -#if defined (ACE_HAS_UNICODE) -#if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) -#define ACE_DEFAULT_NAMESPACE_DIR_W L"/tmp" -#endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ -#if !defined (ACE_DEFAULT_LOCALNAME_W) -#define ACE_DEFAULT_LOCALNAME_W L"localnames" -#endif /* ACE_DEFAULT_LOCALNAME_W */ -#if !defined (ACE_DEFAULT_GLOBALNAME_W) -#define ACE_DEFAULT_GLOBALNAME_W L"globalnames" -#endif /* ACE_DEFAULT_GLOBALNAME_W */ -#else -#if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) -#define ACE_DEFAULT_NAMESPACE_DIR_W "/tmp" -#endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ -#if !defined (ACE_DEFAULT_LOCALNAME_W) -#define ACE_DEFAULT_LOCALNAME_W "localnames" -#endif /* ACE_DEFAULT_LOCALNAME_W */ -#if !defined (ACE_DEFAULT_GLOBALNAME_W) -#define ACE_DEFAULT_GLOBALNAME_W "globalnames" -#endif /* ACE_DEFAULT_GLOBALNAME_W */ -#endif /* ACE_HAS_UNICODE */ +# if !defined (ACE_DEFAULT_NAMESPACE_DIR_A) +# define ACE_DEFAULT_NAMESPACE_DIR_A "/tmp" +# endif /* ACE_DEFAULT_NAMESPACE_DIR_A */ + +# if !defined (ACE_DEFAULT_LOCALNAME_A) +# define ACE_DEFAULT_LOCALNAME_A "localnames" +# endif /* ACE_DEFAULT_LOCALNAME_A */ + +# if !defined (ACE_DEFAULT_GLOBALNAME_A) +# define ACE_DEFAULT_GLOBALNAME_A "globalnames" +# endif /* ACE_DEFAULT_GLOBALNAME_A */ + +# if defined (ACE_HAS_UNICODE) +# if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) +# define ACE_DEFAULT_NAMESPACE_DIR_W L"/tmp" +# endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ +# if !defined (ACE_DEFAULT_LOCALNAME_W) +# define ACE_DEFAULT_LOCALNAME_W L"localnames" +# endif /* ACE_DEFAULT_LOCALNAME_W */ +# if !defined (ACE_DEFAULT_GLOBALNAME_W) +# define ACE_DEFAULT_GLOBALNAME_W L"globalnames" +# endif /* ACE_DEFAULT_GLOBALNAME_W */ +# else +# if !defined (ACE_DEFAULT_NAMESPACE_DIR_W) +# define ACE_DEFAULT_NAMESPACE_DIR_W "/tmp" +# endif /* ACE_DEFAULT_NAMESPACE_DIR_W */ +# if !defined (ACE_DEFAULT_LOCALNAME_W) +# define ACE_DEFAULT_LOCALNAME_W "localnames" +# endif /* ACE_DEFAULT_LOCALNAME_W */ +# if !defined (ACE_DEFAULT_GLOBALNAME_W) +# define ACE_DEFAULT_GLOBALNAME_W "globalnames" +# endif /* ACE_DEFAULT_GLOBALNAME_W */ +# endif /* ACE_HAS_UNICODE */ // Used for ACE_MMAP_Memory_Pool -#if !defined (ACE_DEFAULT_BACKING_STORE) -#define ACE_DEFAULT_BACKING_STORE "/tmp/ace-malloc-XXXXXX" -#endif /* ACE_DEFAULT_BACKING_STORE */ +# if !defined (ACE_DEFAULT_BACKING_STORE) +# define ACE_DEFAULT_BACKING_STORE "/tmp/ace-malloc-XXXXXX" +# endif /* ACE_DEFAULT_BACKING_STORE */ // Used for logging -#if !defined (ACE_DEFAULT_LOGFILE) -#define ACE_DEFAULT_LOGFILE "/tmp/logfile" -#endif /* ACE_DEFAULT_LOGFILE */ +# if !defined (ACE_DEFAULT_LOGFILE) +# define ACE_DEFAULT_LOGFILE "/tmp/logfile" +# endif /* ACE_DEFAULT_LOGFILE */ // Used for dynamic linking. -#if !defined (ACE_DEFAULT_SVC_CONF) -#define ACE_DEFAULT_SVC_CONF "./svc.conf" -#endif /* ACE_DEFAULT_SVC_CONF */ +# if !defined (ACE_DEFAULT_SVC_CONF) +# define ACE_DEFAULT_SVC_CONF "./svc.conf" +# endif /* ACE_DEFAULT_SVC_CONF */ // The following are #defines and #includes that are specific to UNIX. -#define ACE_STDIN 0 -#define ACE_STDOUT 1 -#define ACE_STDERR 2 +# define ACE_STDIN 0 +# define ACE_STDOUT 1 +# define ACE_STDERR 2 // Be consistent with Winsock naming -#define ACE_INVALID_HANDLE -1 -#define ACE_SYSCALL_FAILED -1 +# define ACE_INVALID_HANDLE -1 +# define ACE_SYSCALL_FAILED -1 -#define ACE_SEH_TRY if (1) -#define ACE_SEH_EXCEPT(X) while (0) -#define ACE_SEH_FINALLY if (1) +# define ACE_SEH_TRY if (1) +# define ACE_SEH_EXCEPT(X) while (0) +# define ACE_SEH_FINALLY if (1) // The "null" device on UNIX. -#define ACE_DEV_NULL "/dev/null" +# define ACE_DEV_NULL "/dev/null" // Wrapper for NT events on UNIX. @@ -2907,112 +2911,112 @@ struct ACE_OVERLAPPED }; // Add some typedefs and macros to enhance Win32 conformance... -#if !defined (LPSECURITY_ATTRIBUTES) -#define LPSECURITY_ATTRIBUTES int -#endif /* !defined LPSECURITY_ATTRIBUTES */ -#if !defined (GENERIC_READ) -#define GENERIC_READ 0 -#endif /* !defined GENERIC_READ */ -#if !defined (FILE_SHARE_READ) -#define FILE_SHARE_READ 0 -#endif /* !defined FILE_SHARE_READ */ -#if !defined (OPEN_EXISTING) -#define OPEN_EXISTING 0 -#endif /* !defined OPEN_EXISTING */ -#if !defined (FILE_ATTRIBUTE_NORMAL) -#define FILE_ATTRIBUTE_NORMAL 0 -#endif /* !defined FILE_ATTRIBUTE_NORMAL */ -#if !defined (MAXIMUM_WAIT_OBJECTS) -#define MAXIMUM_WAIT_OBJECTS 0 -#endif /* !defined MAXIMUM_WAIT_OBJECTS */ -#if !defined (FILE_FLAG_OVERLAPPED) -#define FILE_FLAG_OVERLAPPED 0 -#endif /* !defined FILE_FLAG_OVERLAPPED */ - -#if defined (ACE_HAS_BROKEN_IF_HEADER) +# if !defined (LPSECURITY_ATTRIBUTES) +# define LPSECURITY_ATTRIBUTES int +# endif /* !defined LPSECURITY_ATTRIBUTES */ +# if !defined (GENERIC_READ) +# define GENERIC_READ 0 +# endif /* !defined GENERIC_READ */ +# if !defined (FILE_SHARE_READ) +# define FILE_SHARE_READ 0 +# endif /* !defined FILE_SHARE_READ */ +# if !defined (OPEN_EXISTING) +# define OPEN_EXISTING 0 +# endif /* !defined OPEN_EXISTING */ +# if !defined (FILE_ATTRIBUTE_NORMAL) +# define FILE_ATTRIBUTE_NORMAL 0 +# endif /* !defined FILE_ATTRIBUTE_NORMAL */ +# if !defined (MAXIMUM_WAIT_OBJECTS) +# define MAXIMUM_WAIT_OBJECTS 0 +# endif /* !defined MAXIMUM_WAIT_OBJECTS */ +# if !defined (FILE_FLAG_OVERLAPPED) +# define FILE_FLAG_OVERLAPPED 0 +# endif /* !defined FILE_FLAG_OVERLAPPED */ + +# if defined (ACE_HAS_BROKEN_IF_HEADER) struct ifafilt; -#endif /* ACE_HAS_BROKEN_IF_HEADER */ +# endif /* ACE_HAS_BROKEN_IF_HEADER */ -#if defined (ACE_HAS_AIX_BROKEN_SOCKET_HEADER) +# if defined (ACE_HAS_AIX_BROKEN_SOCKET_HEADER) #undef __cplusplus #include /**/ <sys/socket.h> #define __cplusplus -#else +# else #include /**/ <sys/socket.h> -#endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */ +# endif /* ACE_HAS_AIX_BROKEN_SOCKET_HEADER */ extern "C" { -#if defined (VXWORKS) +# if defined (VXWORKS) struct hostent { char *h_name; /* official name of host */ char **h_aliases; /* aliases: not used on VxWorks */ int h_addrtype; /* host address type */ int h_length; /* address length */ char **h_addr_list; /* (first, only) address from name server */ -#define h_addr h_addr_list[0] /* the first address */ +# define h_addr h_addr_list[0] /* the first address */ }; -#else -#if defined (ACE_HAS_STL_QUEUE_CONFLICT) -#define queue _Queue_ -#endif /* ACE_HAS_STL_QUEUE_CONFLICT */ -#include /**/ <netdb.h> -#if defined (ACE_HAS_STL_QUEUE_CONFLICT) -#undef queue -#endif /* ACE_HAS_STL_QUEUE_CONFLICT */ -#include /**/ <netdb.h> -#endif /* VXWORKS */ +# else +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# define queue _Queue_ +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ +# include /**/ <netdb.h> +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# undef queue +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ +# include /**/ <netdb.h> +# endif /* VXWORKS */ // This part if to avoid STL name conflict with the map structure // in net/if.h. -#if defined (ACE_HAS_STL_MAP_CONFLICT) -#define map _Resource_Allocation_Map_ -#endif /* ACE_HAS_STL_MAP_CONFLICT */ -#include /**/ <net/if.h> -#if defined (ACE_HAS_STL_MAP_CONFLICT) -#undef map -#endif /* ACE_HAS_STL_MAP_CONFLICT */ - -#if defined (ACE_HAS_STL_QUEUE_CONFLICT) -#define queue _Queue_ -#endif /* ACE_HAS_STL_QUEUE_CONFLICT */ -#include /**/ <netinet/in.h> -#if defined (ACE_HAS_STL_QUEUE_CONFLICT) -#undef queue -#endif /* ACE_HAS_STL_QUEUE_CONFLICT */ - -#if defined(VXWORKS) && defined(ghs) +# if defined (ACE_HAS_STL_MAP_CONFLICT) +# define map _Resource_Allocation_Map_ +# endif /* ACE_HAS_STL_MAP_CONFLICT */ +# include /**/ <net/if.h> +# if defined (ACE_HAS_STL_MAP_CONFLICT) +# undef map +# endif /* ACE_HAS_STL_MAP_CONFLICT */ + +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# define queue _Queue_ +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ +# include /**/ <netinet/in.h> +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# undef queue +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ + +# if defined(VXWORKS) && defined(ghs) // Works around a lack of proper prototypes for these functions on VxWorks unsigned long inet_addr(const char *); char *inet_ntoa(const struct in_addr); struct in_addr inet_makeaddr(const int, const int); unsigned long inet_network(const char *); -#else -#include /**/ <arpa/inet.h> -#endif /* VXWORKS && ghs */ +# else +# include /**/ <arpa/inet.h> +# endif /* VXWORKS && ghs */ } -#if !defined (ACE_LACKS_TCP_H) -#include /**/ <netinet/tcp.h> -#endif /* ACE_LACKS_TCP_H */ - -#if defined (__Lynx__) -# ifndef howmany -# define howmany(x, y) (((x)+((y)-1))/(y)) -# endif /* howmany */ -#endif /* __Lynx__ */ - -#if defined (CHORUS) -#include /**/ <chorus.h> -#include /**/ <cx/select.h> -#include /**/ <sys/uio.h> -#include /**/ <time.h> -#include /**/ <stdfileio.h> -#include /**/ <am/afexec.h> -#include /**/ <sys/types.h> -#include /**/ <sys/signal.h> -#include /**/ <sys/wait.h> -#include /**/ <pwd.h> -#include /**/ <timer/chBench.h> +# if !defined (ACE_LACKS_TCP_H) +# include /**/ <netinet/tcp.h> +# endif /* ACE_LACKS_TCP_H */ + +# if defined (__Lynx__) +# ifndef howmany +# define howmany(x, y) (((x)+((y)-1))/(y)) +# endif /* howmany */ +# endif /* __Lynx__ */ + +# if defined (CHORUS) +# include /**/ <chorus.h> +# include /**/ <cx/select.h> +# include /**/ <sys/uio.h> +# include /**/ <time.h> +# include /**/ <stdfileio.h> +# include /**/ <am/afexec.h> +# include /**/ <sys/types.h> +# include /**/ <sys/signal.h> +# include /**/ <sys/wait.h> +# include /**/ <pwd.h> +# include /**/ <timer/chBench.h> extern_C int getgid __((void)); extern_C int getuid __((void)); extern_C char* getcwd __((char* buf, size_t size)); @@ -3020,168 +3024,168 @@ extern_C int pipe __((int* fildes)); extern_C int gethostname __((char*, size_t)); // This must come after limits.h is included -#define MAXPATHLEN _POSIX_PATH_MAX +# define MAXPATHLEN _POSIX_PATH_MAX typedef cx_fd_mask fd_mask; -#ifndef howmany -#define howmany(x, y) (((x)+((y)-1))/(y)) -#endif /* howmany */ +# ifndef howmany +# define howmany(x, y) (((x)+((y)-1))/(y)) +# endif /* howmany */ typedef void (*__sighandler_t)(int); // keep Signal compilation happy -#elif ! defined (VXWORKS) -#include /**/ <sys/uio.h> -#include /**/ <sys/ipc.h> -#include /**/ <sys/shm.h> -#include /**/ <sys/sem.h> -#include /**/ <sys/file.h> -#include /**/ <sys/time.h> -#include /**/ <sys/resource.h> -#include /**/ <sys/wait.h> -#include /**/ <pwd.h> -#endif /* ! VXWORKS */ -#include /**/ <sys/ioctl.h> -#include /**/ <dirent.h> +# elif ! defined (VXWORKS) +# include /**/ <sys/uio.h> +# include /**/ <sys/ipc.h> +# include /**/ <sys/shm.h> +# include /**/ <sys/sem.h> +# include /**/ <sys/file.h> +# include /**/ <sys/time.h> +# include /**/ <sys/resource.h> +# include /**/ <sys/wait.h> +# include /**/ <pwd.h> +# endif /* ! VXWORKS */ +# include /**/ <sys/ioctl.h> +# include /**/ <dirent.h> // IRIX5 defines bzero() in this odd file... -#if defined (ACE_HAS_BSTRING) -#include /**/ <bstring.h> -#endif /* ACE_HAS_BSTRING */ +# if defined (ACE_HAS_BSTRING) +# include /**/ <bstring.h> +# endif /* ACE_HAS_BSTRING */ // AIX defines bzero() in this odd file... -#if defined (ACE_HAS_STRINGS) -#include /**/ <strings.h> -#endif /* ACE_HAS_STRINGS */ - -#if defined (ACE_HAS_TERM_IOCTLS) -#include /**/ <sys/termios.h> -#endif /* ACE_HAS_TERM_IOCTLS */ - -#if !defined (ACE_LACKS_UNISTD_H) -#include /**/ <unistd.h> -#endif /* ACE_LACKS_UNISTD_H */ - -#if !defined (ACE_LACKS_PARAM_H) -#include /**/ <sys/param.h> -#endif /* ACE_LACKS_PARAM_H */ - -#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) && !defined (VXWORKS) -#include /**/ <sys/un.h> -#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ - -#if defined (ACE_HAS_SIGINFO_T) -#if !defined (ACE_LACKS_SIGINFO_H) -#include /**/ <siginfo.h> -#endif /* ACE_LACKS_SIGINFO_H */ -#if !defined (ACE_LACKS_UCONTEXT_H) -#include /**/ <ucontext.h> -#endif /* ACE_LACKS_UCONTEXT_H */ -#endif /* ACE_HAS_SIGINFO_T */ - -#if defined (ACE_HAS_POLL) -#include /**/ <poll.h> -#endif /* ACE_HAS_POLL */ - -#if defined (ACE_HAS_STREAMS) -#if defined (AIX) -#if !defined (_XOPEN_EXTENDED_SOURCE) -#define _XOPEN_EXTENDED_SOURCE -#endif /* !_XOPEN_EXTENDED_SOURCE */ -#include /**/ <stropts.h> -#undef _XOPEN_EXTENDED_SOURCE -#else -#include /**/ <stropts.h> -#endif /* AIX */ -#endif /* ACE_HAS_STREAMS */ - -#if defined (ACE_LACKS_T_ERRNO) +# if defined (ACE_HAS_STRINGS) +# include /**/ <strings.h> +# endif /* ACE_HAS_STRINGS */ + +# if defined (ACE_HAS_TERM_IOCTLS) +# include /**/ <sys/termios.h> +# endif /* ACE_HAS_TERM_IOCTLS */ + +# if !defined (ACE_LACKS_UNISTD_H) +# include /**/ <unistd.h> +# endif /* ACE_LACKS_UNISTD_H */ + +# if !defined (ACE_LACKS_PARAM_H) +# include /**/ <sys/param.h> +# endif /* ACE_LACKS_PARAM_H */ + +# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) && !defined (VXWORKS) +# include /**/ <sys/un.h> +# endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */ + +# if defined (ACE_HAS_SIGINFO_T) +# if !defined (ACE_LACKS_SIGINFO_H) +# include /**/ <siginfo.h> +# endif /* ACE_LACKS_SIGINFO_H */ +# if !defined (ACE_LACKS_UCONTEXT_H) +# include /**/ <ucontext.h> +# endif /* ACE_LACKS_UCONTEXT_H */ +# endif /* ACE_HAS_SIGINFO_T */ + +# if defined (ACE_HAS_POLL) +# include /**/ <poll.h> +# endif /* ACE_HAS_POLL */ + +# if defined (ACE_HAS_STREAMS) +# if defined (AIX) +# if !defined (_XOPEN_EXTENDED_SOURCE) +# define _XOPEN_EXTENDED_SOURCE +# endif /* !_XOPEN_EXTENDED_SOURCE */ +# include /**/ <stropts.h> +# undef _XOPEN_EXTENDED_SOURCE +# else +# include /**/ <stropts.h> +# endif /* AIX */ +# endif /* ACE_HAS_STREAMS */ + +# if defined (ACE_LACKS_T_ERRNO) extern int t_errno; -#endif /* ACE_LACKS_T_ERRNO */ +# endif /* ACE_LACKS_T_ERRNO */ -#if defined (DIGITAL_UNIX) +# if defined (DIGITAL_UNIX) // sigwait is yet another macro on Digital UNIX 4.0, just causing // trouble when introducing member functions with the same name. // Thanks to Thilo Kielmann" <kielmann@informatik.uni-siegen.de> for // this fix. -# undef sigwait -# if defined (__DECCXX_VER) +# undef sigwait +# if defined (__DECCXX_VER) // cxx on Digital Unix 4.0 needs this declaration. With it, // ::_Psigwait () works with cxx -pthread. g++ does _not_ need it. extern "C" int _Psigwait __((const sigset_t *set, int *sig)); -# endif /* __DECCXX_VER */ -#elif !defined (ACE_HAS_SIGWAIT) +# endif /* __DECCXX_VER */ +# elif !defined (ACE_HAS_SIGWAIT) extern "C" int sigwait (sigset_t *set); -#endif /* ! DIGITAL_UNIX && ! ACE_HAS_SIGWAIT */ +# endif /* ! DIGITAL_UNIX && ! ACE_HAS_SIGWAIT */ -#if defined (ACE_HAS_SELECT_H) -#include /**/ <sys/select.h> -#endif /* ACE_HAS_SELECT_H */ +# if defined (ACE_HAS_SELECT_H) +# include /**/ <sys/select.h> +# endif /* ACE_HAS_SELECT_H */ -#if defined (ACE_HAS_ALLOCA_H) -#include /**/ <alloca.h> -#endif /* ACE_HAS_ALLOCA_H */ +# if defined (ACE_HAS_ALLOCA_H) +# include /**/ <alloca.h> +# endif /* ACE_HAS_ALLOCA_H */ -#if defined (ACE_HAS_TIUSER_H) || defined (ACE_HAS_XTI) -#if defined (ACE_HAS_TIUSER_H_BROKEN_EXTERN_C) +# if defined (ACE_HAS_TIUSER_H) || defined (ACE_HAS_XTI) +# if defined (ACE_HAS_TIUSER_H_BROKEN_EXTERN_C) extern "C" { -#endif /* ACE_HAS_TIUSER_H_BROKEN_EXTERN_C */ -#if defined (ACE_HAS_TIUSER_H) -#include /**/ <tiuser.h> -#else -#include /**/ <xti.h> -#endif /* ACE_HAS_TIUSER_H */ -#if defined (ACE_HAS_TIUSER_H_BROKEN_EXTERN_C) +# endif /* ACE_HAS_TIUSER_H_BROKEN_EXTERN_C */ +# if defined (ACE_HAS_TIUSER_H) +# include /**/ <tiuser.h> +# else +# include /**/ <xti.h> +# endif /* ACE_HAS_TIUSER_H */ +# if defined (ACE_HAS_TIUSER_H_BROKEN_EXTERN_C) } -#endif /* ACE_HAS_TIUSER_H_BROKEN_EXTERN_C */ -#endif /* ACE_HAS_TIUSER_H || ACE_HAS_XTI */ +# endif /* ACE_HAS_TIUSER_H_BROKEN_EXTERN_C */ +# endif /* ACE_HAS_TIUSER_H || ACE_HAS_XTI */ /* Set the proper handle type for dynamically-loaded libraries. */ /* Also define a default 'mode' for loading a library - the names and values */ /* differ between OSes, so if you write code that uses the mode, be careful */ /* of the platform differences. */ -#if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) -#if defined (ACE_HAS_DLFCN_H_BROKEN_EXTERN_C) +# if defined (ACE_HAS_SVR4_DYNAMIC_LINKING) +# if defined (ACE_HAS_DLFCN_H_BROKEN_EXTERN_C) extern "C" { -#endif /* ACE_HAS_DLFCN_H_BROKEN_EXTERN_C */ -# include /**/ <dlfcn.h> -#if defined (ACE_HAS_DLFCN_H_BROKEN_EXTERN_C) +# endif /* ACE_HAS_DLFCN_H_BROKEN_EXTERN_C */ +# include /**/ <dlfcn.h> +# if defined (ACE_HAS_DLFCN_H_BROKEN_EXTERN_C) } -#endif /* ACE_HAS_DLFCN_H_BROKEN_EXTERN_C */ +# endif /* ACE_HAS_DLFCN_H_BROKEN_EXTERN_C */ typedef void *ACE_SHLIB_HANDLE; -#if !defined (RTLD_LAZY) -#define RTLD_LAZY 1 -#endif /* !RTLD_LAZY */ +# if !defined (RTLD_LAZY) +# define RTLD_LAZY 1 +# endif /* !RTLD_LAZY */ const int ACE_DEFAULT_SHLIB_MODE = RTLD_LAZY; -#elif defined (__hpux) -# if defined(__GNUC__) || __cplusplus >= 199707L -# include /**/ <dl.h> -# else -# include /**/ <cxxdl.h> -# endif /* (g++ || HP aC++) vs. HP C++ */ +# elif defined (__hpux) +# if defined(__GNUC__) || __cplusplus >= 199707L +# include /**/ <dl.h> +# else +# include /**/ <cxxdl.h> +# endif /* (g++ || HP aC++) vs. HP C++ */ typedef shl_t ACE_SHLIB_HANDLE; const int ACE_DEFAULT_SHLIB_MODE = BIND_DEFERRED; -#else +# else #if !defined(RTLD_LAZY) # define RTLD_LAZY 1 #endif /* !RTLD_LAZY */ typedef void *ACE_SHLIB_HANDLE; const int ACE_DEFAULT_SHLIB_MODE = RTLD_LAZY; -#endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */ +# endif /* ACE_HAS_SVR4_DYNAMIC_LINKING */ -#if defined (ACE_HAS_SOCKIO_H) -#include /**/ <sys/sockio.h> -#endif /* ACE_HAS_SOCKIO_ */ +# if defined (ACE_HAS_SOCKIO_H) +# include /**/ <sys/sockio.h> +# endif /* ACE_HAS_SOCKIO_ */ // There must be a better way to do this... -#if !defined (RLIMIT_NOFILE) -#if defined (linux) || defined (AIX) || defined (SCO) -#if defined (RLIMIT_OFILE) -#define RLIMIT_NOFILE RLIMIT_OFILE -#else -#define RLIMIT_NOFILE 200 -#endif /* RLIMIT_OFILE */ -#endif /* defined (linux) || defined (AIX) || defined (SCO) */ -#endif /* RLIMIT_NOFILE */ - -#if !defined (ACE_HAS_TLI_PROTOTYPES) +# if !defined (RLIMIT_NOFILE) +# if defined (linux) || defined (AIX) || defined (SCO) +# if defined (RLIMIT_OFILE) +# define RLIMIT_NOFILE RLIMIT_OFILE +# else +# define RLIMIT_NOFILE 200 +# endif /* RLIMIT_OFILE */ +# endif /* defined (linux) || defined (AIX) || defined (SCO) */ +# endif /* RLIMIT_NOFILE */ + +# if !defined (ACE_HAS_TLI_PROTOTYPES) // Define ACE_TLI headers for systems that don't prototype them.... extern "C" { @@ -3214,41 +3218,41 @@ extern "C" int t_sync(int fildes); int t_unbind(int fildes); } -#endif /* !ACE_HAS_TLI_PROTOTYPES */ - -#if defined (ACE_LACKS_MMAP) -#define PROT_READ 0 -#define PROT_WRITE 0 -#define PROT_EXEC 0 -#define PROT_NONE 0 -#define PROT_RDWR 0 -#define MAP_PRIVATE 0 -#define MAP_SHARED 0 -#define MAP_FIXED 0 -#endif /* ACE_LACKS_MMAP */ +# endif /* !ACE_HAS_TLI_PROTOTYPES */ + +# if defined (ACE_LACKS_MMAP) +# define PROT_READ 0 +# define PROT_WRITE 0 +# define PROT_EXEC 0 +# define PROT_NONE 0 +# define PROT_RDWR 0 +# define MAP_PRIVATE 0 +# define MAP_SHARED 0 +# define MAP_FIXED 0 +# endif /* ACE_LACKS_MMAP */ // Fixes a problem with HP/UX. -#if defined (ACE_HAS_BROKEN_MMAP_H) +# if defined (ACE_HAS_BROKEN_MMAP_H) extern "C" { -#include /**/ <sys/mman.h> +# include /**/ <sys/mman.h> } -#elif !defined (ACE_LACKS_MMAP) -#include /**/ <sys/mman.h> -#endif /* ACE_HAS_BROKEN_MMAP_H */ +# elif !defined (ACE_LACKS_MMAP) +# include /**/ <sys/mman.h> +# endif /* ACE_HAS_BROKEN_MMAP_H */ // OSF1 has problems with sys/msg.h and C++... -#if defined (ACE_HAS_BROKEN_MSG_H) -#define _KERNEL -#endif /* ACE_HAS_BROKEN_MSG_H */ -#if !defined (ACE_LACKS_SYSV_MSG_H) -#include /**/ <sys/msg.h> -#endif /* ACE_LACKS_SYSV_MSG_H */ -#if defined (ACE_HAS_BROKEN_MSG_H) -#undef _KERNEL -#endif /* ACE_HAS_BROKEN_MSG_H */ - -#if defined (ACE_LACKS_SYSV_MSQ_PROTOS) +# if defined (ACE_HAS_BROKEN_MSG_H) +# define _KERNEL +# endif /* ACE_HAS_BROKEN_MSG_H */ +# if !defined (ACE_LACKS_SYSV_MSG_H) +# include /**/ <sys/msg.h> +# endif /* ACE_LACKS_SYSV_MSG_H */ +# if defined (ACE_HAS_BROKEN_MSG_H) +# undef _KERNEL +# endif /* ACE_HAS_BROKEN_MSG_H */ + +# if defined (ACE_LACKS_SYSV_MSQ_PROTOS) extern "C" { int msgget (key_t, int); @@ -3256,33 +3260,33 @@ extern "C" int msgsnd (int, const void *, size_t, int); int msgctl (int, int, struct msqid_ds *); } -#endif /* ACE_LACKS_SYSV_MSQ_PROTOS */ +# endif /* ACE_LACKS_SYSV_MSQ_PROTOS */ -#if defined (ACE_HAS_PRIOCNTL) -# include /**/ <sys/priocntl.h> -#endif /* ACE_HAS_PRIOCNTL */ +# if defined (ACE_HAS_PRIOCNTL) +# include /**/ <sys/priocntl.h> +# endif /* ACE_HAS_PRIOCNTL */ -#if defined (ACE_HAS_STHREADS) || defined (DIGITAL_UNIX) -# if defined (ACE_LACKS_PRI_T) +# if defined (ACE_HAS_STHREADS) || defined (DIGITAL_UNIX) +# if defined (ACE_LACKS_PRI_T) typedef int pri_t; -# endif /* ACE_LACKS_PRI_T */ +# endif /* ACE_LACKS_PRI_T */ typedef idtype_t ACE_idtype_t; typedef id_t ACE_id_t; -# define ACE_SELF P_MYID +# define ACE_SELF P_MYID typedef pri_t ACE_pri_t; -#else /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */ +# else /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */ typedef int ACE_idtype_t; typedef long ACE_id_t; -# define ACE_SELF (-1) +# define ACE_SELF (-1) typedef short ACE_pri_t; -#endif /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */ +# endif /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */ -#if defined (ACE_HAS_HI_RES_TIMER) +# if defined (ACE_HAS_HI_RES_TIMER) /* hrtime_t is defined on systems (Suns) with ACE_HAS_HI_RES_TIMER */ typedef hrtime_t ACE_hrtime_t; -#else +# else typedef ACE_UINT64 ACE_hrtime_t; -#endif /* ACE_HAS_HI_RES_TIMER */ +# endif /* ACE_HAS_HI_RES_TIMER */ #endif /* !defined (ACE_WIN32) && !defined (ACE_PSOS) */ @@ -3303,7 +3307,7 @@ extern "C" #endif /* ! ACE_MAP_FIXED */ #if defined (ACE_LACKS_UTSNAME_T) -#define _SYS_NMLN 257 +# define _SYS_NMLN 257 struct utsname { TCHAR sysname[_SYS_NMLN]; @@ -3313,7 +3317,7 @@ struct utsname TCHAR machine[_SYS_NMLN]; }; #else -#include /**/ <sys/utsname.h> +# include /**/ <sys/utsname.h> #endif /* ACE_LACKS_UTSNAME_T */ // Increase the range of "address families". Please note that this @@ -3334,11 +3338,11 @@ typedef fd_set ACE_FD_SET_TYPE; #endif /* ACE_SELECT_USES_INT */ #if !defined (MAXNAMELEN) -#if defined (FILENAME_MAX) -#define MAXNAMELEN FILENAME_MAX -#else -#define MAXNAMELEN 256 -#endif /* FILENAME_MAX */ +# if defined (FILENAME_MAX) +# define MAXNAMELEN FILENAME_MAX +# else +# define MAXNAMELEN 256 +# endif /* FILENAME_MAX */ #endif /* MAXNAMELEN */ #if defined (ACE_LACKS_SIGSET) @@ -3355,135 +3359,135 @@ struct sigaction #endif /* ACE_LACKS_SIGACTION */ #if !defined (SIGHUP) -#define SIGHUP 0 +# define SIGHUP 0 #endif /* SIGHUP */ #if !defined (SIGINT) -#define SIGINT 0 +# define SIGINT 0 #endif /* SIGINT */ #if !defined (SIGSEGV) -#define SIGSEGV 0 +# define SIGSEGV 0 #endif /* SIGSEGV */ #if !defined (SIGIO) -#define SIGIO 0 +# define SIGIO 0 #endif /* SIGSEGV */ #if !defined (SIGUSR1) -#define SIGUSR1 0 +# define SIGUSR1 0 #endif /* SIGUSR1 */ #if !defined (SIGUSR2) -#define SIGUSR2 0 +# define SIGUSR2 0 #endif /* SIGUSR2 */ #if !defined (SIGCHLD) -#define SIGCHLD 0 +# define SIGCHLD 0 #endif /* SIGCHLD */ #if !defined (SIGCLD) -#define SIGCLD SIGCHLD +# define SIGCLD SIGCHLD #endif /* SIGCLD */ #if !defined (SIGQUIT) -#define SIGQUIT 0 +# define SIGQUIT 0 #endif /* SIGQUIT */ #if !defined (SIGPIPE) -#define SIGPIPE 0 +# define SIGPIPE 0 #endif /* SIGPIPE */ #if !defined (SIGALRM) -#define SIGALRM 0 +# define SIGALRM 0 #endif /* SIGALRM */ #if !defined (SIG_DFL) -#define SIG_DFL ((__sighandler_t) 0) +# define SIG_DFL ((__sighandler_t) 0) #endif /* SIG_DFL */ #if !defined (SIG_IGN) -#define SIG_IGN ((__sighandler_t) 1) /* ignore signal */ +# define SIG_IGN ((__sighandler_t) 1) /* ignore signal */ #endif /* SIG_IGN */ #if !defined (SIG_ERR) -#define SIG_ERR ((__sighandler_t) -1) /* error return from signal */ +# define SIG_ERR ((__sighandler_t) -1) /* error return from signal */ #endif /* SIG_ERR */ #if !defined (O_NONBLOCK) -#define O_NONBLOCK 1 +# define O_NONBLOCK 1 #endif /* O_NONBLOCK */ #if !defined (SIG_BLOCK) -#define SIG_BLOCK 1 +# define SIG_BLOCK 1 #endif /* SIG_BLOCK */ #if !defined (SIG_UNBLOCK) -#define SIG_UNBLOCK 2 +# define SIG_UNBLOCK 2 #endif /* SIG_UNBLOCK */ #if !defined (SIG_SETMASK) -#define SIG_SETMASK 3 +# define SIG_SETMASK 3 #endif /* SIG_SETMASK */ #if !defined (IPC_CREAT) -#define IPC_CREAT 0 +# define IPC_CREAT 0 #endif /* IPC_CREAT */ #if !defined (IPC_NOWAIT) -#define IPC_NOWAIT 0 +# define IPC_NOWAIT 0 #endif /* IPC_NOWAIT */ #if !defined (IPC_RMID) -#define IPC_RMID 0 +# define IPC_RMID 0 #endif /* IPC_RMID */ #if !defined (IPC_EXCL) -#define IPC_EXCL 0 +# define IPC_EXCL 0 #endif /* IPC_EXCL */ #if !defined (IP_DROP_MEMBERSHIP) -#define IP_DROP_MEMBERSHIP 0 +# define IP_DROP_MEMBERSHIP 0 #endif /* IP_DROP_MEMBERSHIP */ #if !defined (IP_ADD_MEMBERSHIP) -#define IP_ADD_MEMBERSHIP 0 +# define IP_ADD_MEMBERSHIP 0 #endif /* IP_ADD_MEMBERSHIP */ #if !defined (SIOCGIFADDR) -#define SIOCGIFADDR 0 +# define SIOCGIFADDR 0 #endif /* SIOCGIFADDR */ #if !defined (IPC_PRIVATE) -#define IPC_PRIVATE ACE_INVALID_SEM_KEY +# define IPC_PRIVATE ACE_INVALID_SEM_KEY #endif /* IPC_PRIVATE */ #if !defined (IPC_STAT) -#define IPC_STAT 0 +# define IPC_STAT 0 #endif /* IPC_STAT */ #if !defined (GETVAL) -#define GETVAL 0 +# define GETVAL 0 #endif /* GETVAL */ #if !defined (F_GETFL) -#define F_GETFL 0 +# define F_GETFL 0 #endif /* F_GETFL */ #if !defined (SETVAL) -#define SETVAL 0 +# define SETVAL 0 #endif /* SETVAL */ #if !defined (GETALL) -#define GETALL 0 +# define GETALL 0 #endif /* GETALL */ #if !defined (SETALL) -#define SETALL 0 +# define SETALL 0 #endif /* SETALL */ #if !defined (SEM_UNDO) -#define SEM_UNDO 0 +# define SEM_UNDO 0 #endif /* SEM_UNDO */ #if defined (__Lynx__) @@ -3496,86 +3500,86 @@ struct sigaction #endif /* __Lynx__ */ #if !defined (R_OK) -#define R_OK 04 /* Test for Read permission. */ +# define R_OK 04 /* Test for Read permission. */ #endif /* R_OK */ #if !defined (W_OK) -#define W_OK 02 /* Test for Write permission. */ +# define W_OK 02 /* Test for Write permission. */ #endif /* W_OK */ #if !defined (X_OK) -#define X_OK 01 /* Test for eXecute permission. */ +# define X_OK 01 /* Test for eXecute permission. */ #endif /* X_OK */ #if !defined (F_OK) -#define F_OK 0 /* Test for existence of File. */ +# define F_OK 0 /* Test for existence of File. */ #endif /* F_OK */ #if !defined (EIDRM) -#define EIDRM 0 +# define EIDRM 0 #endif /* !EIDRM */ #if !defined (ENOSYS) -#define ENOSYS EFAULT /* Operation not supported or unknown error. */ +# define ENOSYS EFAULT /* Operation not supported or unknown error. */ #endif /* !ENOSYS */ #if !defined (ENOTSUP) -#define ENOTSUP ENOSYS /* Operation not supported. */ +# define ENOTSUP ENOSYS /* Operation not supported. */ #endif /* !ENOTSUP */ #if !defined (WNOHANG) -#define WNOHANG 42 +# define WNOHANG 42 #endif /* !WNOHANG */ #if !defined (EDEADLK) -#define EDEADLK 1000 /* Some large number.... */ +# define EDEADLK 1000 /* Some large number.... */ #endif /* !ENOTSUP */ #if !defined (MS_SYNC) -#define MS_SYNC 0x0 +# define MS_SYNC 0x0 #endif /* !MS_SYNC */ #if !defined (PIPE_BUF) -#define PIPE_BUF 5120 +# define PIPE_BUF 5120 #endif /* PIPE_BUF */ #if !defined (PROT_RDWR) -#define PROT_RDWR (PROT_READ|PROT_WRITE) +# define PROT_RDWR (PROT_READ|PROT_WRITE) #endif /* PROT_RDWR */ #if !defined (WNOHANG) -#define WNOHANG 0 +# define WNOHANG 0 #endif /* WNOHANG */ #if defined (ACE_HAS_POSIX_NONBLOCK) -#define ACE_NONBLOCK O_NONBLOCK +# define ACE_NONBLOCK O_NONBLOCK #else -#define ACE_NONBLOCK O_NDELAY +# define ACE_NONBLOCK O_NDELAY #endif /* ACE_HAS_POSIX_NONBLOCK */ #define LOCALNAME 0 #define REMOTENAME 1 #if !defined (ETIMEDOUT) && defined (ETIME) -#define ETIMEDOUT ETIME +# define ETIMEDOUT ETIME #endif /* ETIMEDOUT */ #if !defined (ETIME) && defined (ETIMEDOUT) -#define ETIME ETIMEDOUT +# define ETIME ETIMEDOUT #endif /* ETIMED */ #if !defined (EBUSY) -#define EBUSY ETIME +# define EBUSY ETIME #endif /* EBUSY */ #if !defined (_SC_TIMER_MAX) -#define _SC_TIMER_MAX 44 +# define _SC_TIMER_MAX 44 #endif /* _SC_TIMER_MAX */ // Default number of <ACE_Event_Handler>s supported by // <ACE_Timer_Heap>. #if !defined (ACE_DEFAULT_TIMERS) -#define ACE_DEFAULT_TIMERS _SC_TIMER_MAX +# define ACE_DEFAULT_TIMERS _SC_TIMER_MAX #endif /* ACE_DEFAULT_TIMERS */ #if defined (ACE_HAS_STRUCT_NETDB_DATA) @@ -3583,15 +3587,15 @@ typedef char ACE_HOSTENT_DATA[sizeof(struct hostent_data)]; typedef char ACE_SERVENT_DATA[sizeof(struct servent_data)]; typedef char ACE_PROTOENT_DATA[sizeof(struct protoent_data)]; #else -#if !defined ACE_HOSTENT_DATA_SIZE -#define ACE_HOSTENT_DATA_SIZE (4*1024) -#endif /*ACE_HOSTENT_DATA_SIZE */ -#if !defined ACE_SERVENT_DATA_SIZE -#define ACE_SERVENT_DATA_SIZE (4*1024) -#endif /*ACE_SERVENT_DATA_SIZE */ -#if !defined ACE_PROTOENT_DATA_SIZE -#define ACE_PROTOENT_DATA_SIZE (2*1024) -#endif /*ACE_PROTOENT_DATA_SIZE */ +# if !defined ACE_HOSTENT_DATA_SIZE +# define ACE_HOSTENT_DATA_SIZE (4*1024) +# endif /*ACE_HOSTENT_DATA_SIZE */ +# if !defined ACE_SERVENT_DATA_SIZE +# define ACE_SERVENT_DATA_SIZE (4*1024) +# endif /*ACE_SERVENT_DATA_SIZE */ +# if !defined ACE_PROTOENT_DATA_SIZE +# define ACE_PROTOENT_DATA_SIZE (2*1024) +# endif /*ACE_PROTOENT_DATA_SIZE */ typedef char ACE_HOSTENT_DATA[ACE_HOSTENT_DATA_SIZE]; typedef char ACE_SERVENT_DATA[ACE_SERVENT_DATA_SIZE]; typedef char ACE_PROTOENT_DATA[ACE_PROTOENT_DATA_SIZE]; @@ -3609,7 +3613,7 @@ union semun // Max size of an ACE Log Record data buffer. This can be reset in // the config.h file if you'd like to increase or decrease the size. #if !defined (ACE_MAXLOGMSGLEN) -#define ACE_MAXLOGMSGLEN 4 * 1024 +# define ACE_MAXLOGMSGLEN 4 * 1024 #endif /* ACE_MAXLOGMSGLEN */ // Max size of an ACE Token. @@ -3642,22 +3646,22 @@ typedef void *(*ACE_THR_C_FUNC)(void *); } #if !defined (MAP_FAILED) -#define MAP_FAILED ((void *) -1) +# define MAP_FAILED ((void *) -1) #elif defined (ACE_HAS_LONG_MAP_FAILED) -#undef MAP_FAILED -#define MAP_FAILED ((void *) -1L) +# undef MAP_FAILED +# define MAP_FAILED ((void *) -1L) #endif /* MAP_FAILED */ #if defined (ACE_HAS_CHARPTR_DL) typedef char * ACE_DL_TYPE; -#if defined (ACE_HAS_UNICODE) +# if defined (ACE_HAS_UNICODE) typedef wchar_t * ACE_WIDE_DL_TYPE; -#endif /* ACE_HAS_UNICODE */ +# endif /* ACE_HAS_UNICODE */ #else typedef const char * ACE_DL_TYPE; -#if defined (ACE_HAS_UNICODE) +# if defined (ACE_HAS_UNICODE) typedef const wchar_t * ACE_WIDE_DL_TYPE; -#endif /* ACE_HAS_UNICODE */ +# endif /* ACE_HAS_UNICODE */ #endif /* ACE_HAS_CHARPTR_DL */ #if !defined (ACE_HAS_SIGINFO_T) @@ -3679,27 +3683,27 @@ typedef int ucontext_t; #endif /* ACE_HAS_UCONTEXT_T */ #if !defined (SA_SIGINFO) -#define SA_SIGINFO 0 +# define SA_SIGINFO 0 #endif /* SA_SIGINFO */ #if !defined (SA_RESTART) -#define SA_RESTART 0 +# define SA_RESTART 0 #endif /* SA_RESTART */ #if defined (ACE_HAS_TIMOD_H) -#if defined (ACE_HAS_STL_QUEUE_CONFLICT) -#define queue _Queue_ -#endif /* ACE_HAS_STL_QUEUE_CONFLICT */ -#include /**/ <sys/timod.h> -#if defined (ACE_HAS_STL_QUEUE_CONFLICT) -#undef queue -#endif /* ACE_HAS_STL_QUEUE_CONFLICT */ +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# define queue _Queue_ +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ +# include /**/ <sys/timod.h> +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# undef queue +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ #elif defined (ACE_HAS_OSF_TIMOD_H) -#include /**/ <tli/timod.h> +# include /**/ <tli/timod.h> #endif /* ACE_HAS_TIMOD_H */ #if defined (ACE_HAS_BROKEN_T_ERRNO) -#undef t_errno +# undef t_errno #endif /* ACE_HAS_BROKEN_T_ERRNO */ class ACE_Export ACE_Thread_ID @@ -3738,10 +3742,10 @@ typedef void (*ACE_Sig_Handler_Ex) (int, siginfo_t *siginfo, ucontext_t *ucontex // declaration here. #if defined (ACE_REDEFINES_XTI_FUNCTIONS) -#include /**/ <xti.h> -#if defined (UNIXWARE_2_0) /* They apparantly forgot one... */ +# include /**/ <xti.h> +# if defined (UNIXWARE_2_0) /* They apparantly forgot one... */ extern "C" int _xti_error(char *); -#endif /* UNIXWARE */ +# endif /* UNIXWARE */ #endif /* ACE_REDEFINES_XTI_FUNCTIONS */ // = The ACE_Sched_Priority type should be used for platform- @@ -3753,7 +3757,7 @@ typedef int ACE_Sched_Priority; class ACE_Sched_Params; #if defined (ACE_LACKS_FILELOCKS) -#if ! defined (VXWORKS) +# if ! defined (VXWORKS) // VxWorks defines struct flock in sys/fcntlcom.h. But it doesn't // appear to support flock (). struct flock @@ -3766,7 +3770,7 @@ struct flock pid_t l_pid; long l_pad[4]; /* reserve area */ }; -#endif /* ! VXWORKS */ +# endif /* ! VXWORKS */ #endif /* ACE_LACKS_FILELOCKS */ #if !defined (ACE_HAS_IP_MULTICAST) @@ -4220,15 +4224,15 @@ public: struct timespec *remaining = 0); #if defined (ACE_HAS_BROKEN_R_ROUTINES) -#undef ctime_r -#undef asctime_r -#undef rand_r -#undef getpwnam_r +# undef ctime_r +# undef asctime_r +# undef rand_r +# undef getpwnam_r #endif /* ACE_HAS_BROKEN_R_ROUTINES */ #if defined (difftime) -#define ACE_DIFFTIME(t1, t0) difftime(t1,t0) -#undef difftime +# define ACE_DIFFTIME(t1, t0) difftime(t1,t0) +# undef difftime #endif /* difftime */ // = A set of wrappers for operations on time. @@ -4799,18 +4803,18 @@ public: int base); static int ace_isspace (wchar_t c); -#if defined (ACE_WIN32) +# if defined (ACE_WIN32) static wchar_t *strstr (const wchar_t *s, const wchar_t *t); static wchar_t *strdup (const wchar_t *s); static int sprintf (wchar_t *buf, const wchar_t *format, ...); -#if 0 +# if 0 static int sprintf (wchar_t *buf, const char *format, ...); -#endif /* 0 */ +# endif /* 0 */ // the following three are newly added for CE. // but they can also be use on Win32. // static char *fgets (wchar_t *buf, @@ -4844,9 +4848,9 @@ public: static int rename (const wchar_t *oldname, const wchar_t *newname); static int unlink (const wchar_t *path); -#if defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) static wchar_t *dlerror (void); -#endif /* !ACE_HAS_WINCE */ +# endif /* !ACE_HAS_WINCE */ static ACE_SHLIB_HANDLE dlopen (ACE_WIDE_DL_TYPE filename, int mode = ACE_DEFAULT_SHLIB_MODE); @@ -4857,7 +4861,7 @@ public: static int chdir (const wchar_t *path); static wchar_t *getcwd (wchar_t *, size_t); -#endif /* ACE_WIN32 */ +# endif /* ACE_WIN32 */ #endif /* ACE_HAS_UNICODE */ // = A set of wrappers for TLI. @@ -5158,11 +5162,11 @@ extern "C" ssize_t writev_timedwait (ACE_HANDLE handle, struct timespec *timeout); #endif /* ACE_LACKS_TIMEDWAIT_PROTOTYPES */ -# if defined (ACE_HAS_TSS_EMULATION) +#if defined (ACE_HAS_TSS_EMULATION) // Allow config.h to set the default number of thread keys. -# if !defined (ACE_DEFAULT_THREAD_KEYS) -# define ACE_DEFAULT_THREAD_KEYS 64 -# endif /* ! ACE_DEFAULT_THREAD_KEYS */ +# if !defined (ACE_DEFAULT_THREAD_KEYS) +# define ACE_DEFAULT_THREAD_KEYS 64 +# endif /* ! ACE_DEFAULT_THREAD_KEYS */ class ACE_TSS_Emulation { @@ -5217,7 +5221,7 @@ private: static void **&tss_base (); // Location of current thread's TSS array. -#if ! defined (VXWORKS) +# if ! defined (VXWORKS) public: // This implementation only works if ::thr_self () returns a small // integer. It is intended for use in testing on Solaris only. @@ -5228,13 +5232,13 @@ public: // are indexed by key. This is for testing only. private: -#if 0 // not implemented yet . . . +# if 0 // not implemented yet . . . // Rely on native thread specific storage for the implementation, // but just use one key. static ACE_thread_key_t native_tss_key_; -#endif /* 0 */ -#endif /* ! VXWORKS */ +# endif /* 0 */ +# endif /* ! VXWORKS */ }; #else /* ! ACE_HAS_TSS_EMULATION */ @@ -5261,21 +5265,21 @@ private: // being used). #if defined(ACE_NEW_THROWS_EXCEPTIONS) -# define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \ +# define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \ do { try { POINTER = new CONSTRUCTOR; } \ catch (bad_alloc) { errno = ENOMEM; return RET_VAL; } \ } while (0) -# define ACE_NEW(POINTER,CONSTRUCTOR) \ +# define ACE_NEW(POINTER,CONSTRUCTOR) \ do { try { POINTER = new CONSTRUCTOR; } \ catch (bad_alloc) { errno = ENOMEM; return; } \ } while (0) #else -# define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \ +# define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \ do { POINTER = new CONSTRUCTOR; \ if (POINTER == 0) { errno = ENOMEM; return RET_VAL; } \ } while (0) -# define ACE_NEW(POINTER,CONSTRUCTOR) \ +# define ACE_NEW(POINTER,CONSTRUCTOR) \ do { POINTER = new CONSTRUCTOR; \ if (POINTER == 0) { errno = ENOMEM; return; } \ } while (0) @@ -5318,11 +5322,11 @@ private: #if defined (ACE_HAS_SIGNAL_SAFE_OS_CALLS) // The following two macros ensure that system calls are properly // restarted (if necessary) when interrupts occur. -#define ACE_OSCALL(OP,TYPE,FAILVALUE,RESULT) \ +# define ACE_OSCALL(OP,TYPE,FAILVALUE,RESULT) \ do \ RESULT = (TYPE) OP; \ while (RESULT == FAILVALUE && errno == EINTR && ACE_LOG_MSG->restart ()) -#define ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) \ +# define ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) \ do { \ TYPE ace_result_; \ do \ @@ -5331,64 +5335,64 @@ private: return ace_result_; \ } while (0) #elif defined (ACE_WIN32) -#define ACE_OSCALL_RETURN(X,TYPE,FAILVALUE) \ +# define ACE_OSCALL_RETURN(X,TYPE,FAILVALUE) \ do \ return (TYPE) X; \ while (0) -#define ACE_OSCALL(X,TYPE,FAILVALUE,RESULT) \ +# define ACE_OSCALL(X,TYPE,FAILVALUE,RESULT) \ do \ RESULT = (TYPE) X; \ while (0) -#define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ +# define ACE_WIN32CALL_RETURN(X,TYPE,FAILVALUE) \ do { \ TYPE ace_result_ = (TYPE) X; \ if (ace_result_ == FAILVALUE) \ errno = ::GetLastError (); \ return ace_result_; \ } while (0) -#define ACE_WIN32CALL(X,TYPE,FAILVALUE,RESULT) \ +# define ACE_WIN32CALL(X,TYPE,FAILVALUE,RESULT) \ do { \ RESULT = (TYPE) X; \ if (RESULT == FAILVALUE) \ errno = ::GetLastError (); \ } while (0) #else -#define ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) do { TYPE ace_result_ = FAILVALUE; ace_result_ = ace_result_; return OP; } while (0) -#define ACE_OSCALL(OP,TYPE,FAILVALUE,RESULT) do { RESULT = (TYPE) OP; } while (0) +# define ACE_OSCALL_RETURN(OP,TYPE,FAILVALUE) do { TYPE ace_result_ = FAILVALUE; ace_result_ = ace_result_; return OP; } while (0) +# define ACE_OSCALL(OP,TYPE,FAILVALUE,RESULT) do { RESULT = (TYPE) OP; } while (0) #endif /* ACE_HAS_SIGNAL_SAFE_OS_CALLS */ #if defined (ACE_HAS_THR_C_FUNC) // This is necessary to work around nasty problems with MVS C++. extern "C" ACE_Export void ace_mutex_lock_cleanup_adapter (void *args); -#define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A); -#define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) +# define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A); +# define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) #elif defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CLEANUP) -#define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_OS::mutex_lock_cleanup, (void *) A); -#define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) +# define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_OS::mutex_lock_cleanup, (void *) A); +# define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A) #else -#define ACE_PTHREAD_CLEANUP_PUSH(A) -#define ACE_PTHREAD_CLEANUP_POP(A) +# define ACE_PTHREAD_CLEANUP_PUSH(A) +# define ACE_PTHREAD_CLEANUP_POP(A) #endif /* ACE_HAS_THR_C_FUNC */ #if !defined (ACE_DEFAULT_MUTEX_A) -#define ACE_DEFAULT_MUTEX_A "ACE_MUTEX" +# define ACE_DEFAULT_MUTEX_A "ACE_MUTEX" #endif /* ACE_DEFAULT_MUTEX_A */ #if !defined (ACE_MAIN) -#define ACE_MAIN main +# define ACE_MAIN main #endif /* ! ACE_MAIN */ #if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) // Rename "main ()" on platforms that don't allow it to be called "main ()". // Also, create an ACE_Object_Manager static instance in "main ()". -#include "ace/Object_Manager.h" +# include "ace/Object_Manager.h" -#if defined (ACE_PSOSIM) +# if defined (ACE_PSOSIM) // PSOSIM root lacks the standard argc, argv command line parameters, // create dummy argc and argv in the "real" main and pass to "user" main. // NOTE: ACE_MAIN must be defined to give the return type as well as the // name of the entry point. -#define main \ +# define main \ ace_main_i (int, char *[]); /* forward declaration */ \ ACE_MAIN () /* user's entry point, e.g., "main" w/out argc, argv */ \ { \ @@ -5408,12 +5412,12 @@ ACE_MAIN () /* user's entry point, e.g., "main" w/out argc, argv */ \ } \ int \ ace_main_i -#elif defined (ACE_PSOS) +# elif defined (ACE_PSOS) // PSOS root lacks the standard argc, argv command line parameters, // create dummy argc and argv in the "real" main and pass to "user" main. // Ignore return value from user main as well. NOTE: ACE_MAIN must be // defined to give the return type as well as the name of the entry point -#define main \ +# define main \ ace_main_i (int, char *[]); /* forward declaration */ \ ACE_MAIN () /* user's entry point, e.g., "main" w/out argc, argv */ \ { \ @@ -5424,8 +5428,8 @@ ACE_MAIN () /* user's entry point, e.g., "main" w/out argc, argv */ \ } \ int \ ace_main_i -#else -#define main \ +# else +# define main \ ace_main_i (int, char *[]); /* forward declaration */ \ int \ ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., "main" */ \ @@ -5435,16 +5439,16 @@ ACE_MAIN (int argc, char *argv[]) /* user's entry point, e.g., "main" */ \ } \ int \ ace_main_i -#endif /* ACE_PSOSIM */ +# endif /* ACE_PSOSIM */ #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */ #if defined (ACE_HAS_WINCE) -#include "ace/Object_Manager.h" +# include "ace/Object_Manager.h" // We need to rename program entry name "main" with ace_ce_main here // so that we can call it from CE's bridge class. // I'll assume there'll only be DLL version of ACE on CE for now. -#define main \ +# define main \ ace_main_i (int, ASYS_TCHAR *[]); /* forward declaration */ \ int \ ace_ce_main (int argc, ASYS_TCHAR *argv[]) /* user's entry point, e.g., "main" */ \ @@ -5537,72 +5541,82 @@ private: #if defined (UNICODE) -#if !defined (ACE_DEFAULT_NAMESPACE_DIR) -#define ACE_DEFAULT_NAMESPACE_DIR ACE_DEFAULT_NAMESPACE_DIR_W -#endif /* ACE_DEFAULT_NAMESPACE_DIR */ -#if !defined (ACE_DEFAULT_LOCALNAME) -#define ACE_DEFAULT_LOCALNAME ACE_DEFAULT_LOCALNAME_W -#endif /* ACE_DEFAULT_LOCALNAME */ -#if !defined (ACE_DEFAULT_GLOBALNAME) -#define ACE_DEFAULT_GLOBALNAME ACE_DEFAULT_GLOBALNAME_W -#endif /* ACE_DEFAULT_GLOBALNAME */ -#if !defined (ACE_DIRECTORY_SEPARATOR_STR) -#define ACE_DIRECTORY_SEPARATOR_STR ACE_DIRECTORY_SEPARATOR_STR_W -#endif /* ACE_DIRECTORY_SEPARATOR_STR */ -#if !defined (ACE_DIRECTORY_SEPARATOR_CHAR) -#define ACE_DIRECTORY_SEPARATOR_CHAR ACE_DIRECTORY_SEPARATOR_CHAR_W -#endif /* ACE_DIRECTORY_SEPARATOR_CHAR */ -#if !defined (ACE_PLATFORM) -#define ACE_PLATFORM ACE_PLATFORM_W -#endif /* ACE_PLATFORM */ -#if !defined (ACE_PLATFORM_EXE_SUFFIX) -#define ACE_PLATFORM_EXE_SUFFIX ACE_PLATFORM_EXE_SUFFIX_W -#endif /* ACE_PLATFORM_EXE_SUFFIX */ -#if !defined (ACE_DEFAULT_MUTEX_W) -#define ACE_DEFAULT_MUTEX_W L"ACE_MUTEX" -#endif /* ACE_DEFAULT_MUTEX_W */ -#if !defined (ACE_DEFAULT_MUTEX) -#define ACE_DEFAULT_MUTEX ACE_DEFAULT_MUTEX_W -#endif /* ACE_DEFAULT_MUTEX */ +# if !defined (ACE_DEFAULT_NAMESPACE_DIR) +# define ACE_DEFAULT_NAMESPACE_DIR ACE_DEFAULT_NAMESPACE_DIR_W +# endif /* ACE_DEFAULT_NAMESPACE_DIR */ +# if !defined (ACE_DEFAULT_LOCALNAME) +# define ACE_DEFAULT_LOCALNAME ACE_DEFAULT_LOCALNAME_W +# endif /* ACE_DEFAULT_LOCALNAME */ +# if !defined (ACE_DEFAULT_GLOBALNAME) +# define ACE_DEFAULT_GLOBALNAME ACE_DEFAULT_GLOBALNAME_W +# endif /* ACE_DEFAULT_GLOBALNAME */ +# if !defined (ACE_DIRECTORY_SEPARATOR_STR) +# define ACE_DIRECTORY_SEPARATOR_STR ACE_DIRECTORY_SEPARATOR_STR_W +# endif /* ACE_DIRECTORY_SEPARATOR_STR */ +# if !defined (ACE_DIRECTORY_SEPARATOR_CHAR) +# define ACE_DIRECTORY_SEPARATOR_CHAR ACE_DIRECTORY_SEPARATOR_CHAR_W +# endif /* ACE_DIRECTORY_SEPARATOR_CHAR */ +# if !defined (ACE_PLATFORM) +# define ACE_PLATFORM ACE_PLATFORM_W +# endif /* ACE_PLATFORM */ +# if !defined (ACE_PLATFORM_EXE_SUFFIX) +# define ACE_PLATFORM_EXE_SUFFIX ACE_PLATFORM_EXE_SUFFIX_W +# endif /* ACE_PLATFORM_EXE_SUFFIX */ +# if !defined (ACE_DEFAULT_MUTEX_W) +# define ACE_DEFAULT_MUTEX_W L"ACE_MUTEX" +# endif /* ACE_DEFAULT_MUTEX_W */ +# if !defined (ACE_DEFAULT_MUTEX) +# define ACE_DEFAULT_MUTEX ACE_DEFAULT_MUTEX_W +# endif /* ACE_DEFAULT_MUTEX */ #else -#if !defined (ACE_DEFAULT_NAMESPACE_DIR) -#define ACE_DEFAULT_NAMESPACE_DIR ACE_DEFAULT_NAMESPACE_DIR_A -#endif /* ACE_DEFAULT_NAMESPACE_DIR */ -#if !defined (ACE_DEFAULT_LOCALNAME) -#define ACE_DEFAULT_LOCALNAME ACE_DEFAULT_LOCALNAME_A -#endif /* ACE_DEFAULT_LOCALNAME */ -#if !defined (ACE_DEFAULT_GLOBALNAME) -#define ACE_DEFAULT_GLOBALNAME ACE_DEFAULT_GLOBALNAME_A -#endif /* ACE_DEFAULT_GLOBALNAME */ -#if !defined (ACE_DIRECTORY_SEPARATOR_STR) -#define ACE_DIRECTORY_SEPARATOR_STR ACE_DIRECTORY_SEPARATOR_STR_A -#endif /* ACE_DIRECTORY_SEPARATOR_STR */ -#if !defined (ACE_DIRECTORY_SEPARATOR_CHAR) -#define ACE_DIRECTORY_SEPARATOR_CHAR ACE_DIRECTORY_SEPARATOR_CHAR_A -#endif /* ACE_DIRECTORY_SEPARATOR_CHAR */ -#if !defined (ACE_PLATFORM) -#define ACE_PLATFORM ACE_PLATFORM_A -#endif /* ACE_PLATFORM */ -#if !defined (ACE_PLATFORM_EXE_SUFFIX) -#define ACE_PLATFORM_EXE_SUFFIX ACE_PLATFORM_EXE_SUFFIX_A -#endif /* ACE_PLATFORM_EXE_SUFFIX */ -#if !defined (ACE_DEFAULT_MUTEX_W) -#define ACE_DEFAULT_MUTEX_W "ACE_MUTEX" -#endif /* ACE_DEFAULT_MUTEX_W */ -#if !defined (ACE_DEFAULT_MUTEX) -#define ACE_DEFAULT_MUTEX ACE_DEFAULT_MUTEX_A -#endif /* ACE_DEFAULT_MUTEX */ +# if !defined (ACE_DEFAULT_NAMESPACE_DIR) +# define ACE_DEFAULT_NAMESPACE_DIR ACE_DEFAULT_NAMESPACE_DIR_A +# endif /* ACE_DEFAULT_NAMESPACE_DIR */ +# if !defined (ACE_DEFAULT_LOCALNAME) +# define ACE_DEFAULT_LOCALNAME ACE_DEFAULT_LOCALNAME_A +# endif /* ACE_DEFAULT_LOCALNAME */ +# if !defined (ACE_DEFAULT_GLOBALNAME) +# define ACE_DEFAULT_GLOBALNAME ACE_DEFAULT_GLOBALNAME_A +# endif /* ACE_DEFAULT_GLOBALNAME */ +# if !defined (ACE_DIRECTORY_SEPARATOR_STR) +# define ACE_DIRECTORY_SEPARATOR_STR ACE_DIRECTORY_SEPARATOR_STR_A +# endif /* ACE_DIRECTORY_SEPARATOR_STR */ +# if !defined (ACE_DIRECTORY_SEPARATOR_CHAR) +# define ACE_DIRECTORY_SEPARATOR_CHAR ACE_DIRECTORY_SEPARATOR_CHAR_A +# endif /* ACE_DIRECTORY_SEPARATOR_CHAR */ +# if !defined (ACE_PLATFORM) +# define ACE_PLATFORM ACE_PLATFORM_A +# endif /* ACE_PLATFORM */ +# if !defined (ACE_PLATFORM_EXE_SUFFIX) +# define ACE_PLATFORM_EXE_SUFFIX ACE_PLATFORM_EXE_SUFFIX_A +# endif /* ACE_PLATFORM_EXE_SUFFIX */ +# if !defined (ACE_DEFAULT_MUTEX_W) +# define ACE_DEFAULT_MUTEX_W "ACE_MUTEX" +# endif /* ACE_DEFAULT_MUTEX_W */ +# if !defined (ACE_DEFAULT_MUTEX) +# define ACE_DEFAULT_MUTEX ACE_DEFAULT_MUTEX_A +# endif /* ACE_DEFAULT_MUTEX */ #endif /* UNICODE */ -#if defined (ACE_HAS_INLINED_OSCALLS) -#if defined (ACE_INLINE) -#undef ACE_INLINE -#endif /* ACE_INLINE */ -#define ACE_INLINE inline -#include "ace/OS.i" -#endif /* ACE_HAS_INLINED_OSCALLS */ +// Some ACE classes always use inline functions to maintain high +// performance, but some platforms have buggy inline function support. +// In this case, we don't use inline with them. +#if defined (ACE_LACKS_INLINE_FUNCTIONS) +# if defined (ASYS_INLINE) +# undef ASYS_INLINE +# endif /* ASYS_INLINE */ +# define ASYS_INLINE inline +#else +# if defined (ACE_HAS_INLINED_OSCALLS) +# if defined (ACE_INLINE) +# undef ACE_INLINE +# endif /* ACE_INLINE */ +# define ACE_INLINE inline +# include "ace/OS.i" +# endif /* ACE_HAS_INLINED_OSCALLS */ +#endif /* ACE_LACKS_INLINE_FUNCTIONS */ #include "ace/Trace.h" @@ -5623,34 +5637,34 @@ private: // that some data may be lost in this conversion. #if defined (UNICODE) -#include "ace/Auto_Ptr.h" -#include "ace/SString.h" -#define ACE_WIDE_STRING(ASCII_STRING) \ +# include "ace/Auto_Ptr.h" +# include "ace/SString.h" +# define ACE_WIDE_STRING(ASCII_STRING) \ ACE_WString (ASCII_STRING).fast_rep () -#define ACE_MULTIBYTE_STRING(WIDE_STRING) \ +# define ACE_MULTIBYTE_STRING(WIDE_STRING) \ ACE_Auto_Basic_Array_Ptr<char> (ACE_WString (WIDE_STRING).char_rep ()).get () -#define ACE_TEXT_STRING ACE_WString -#if defined (ACE_HAS_MOSTLY_UNICODE_APIS) -#define ASYS_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING -#define ASYS_ONLY_MULTIBYTE_STRING(WIDE_STRING) \ +# define ACE_TEXT_STRING ACE_WString +# if defined (ACE_HAS_MOSTLY_UNICODE_APIS) +# define ASYS_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING +# define ASYS_ONLY_MULTIBYTE_STRING(WIDE_STRING) \ ACE_Auto_Basic_Array_Ptr<char> (ACE_WString (WIDE_STRING).char_rep ()).get () -#else -#define ASYS_MULTIBYTE_STRING(WIDE_STRING) \ +# else +# define ASYS_MULTIBYTE_STRING(WIDE_STRING) \ ACE_Auto_Basic_Array_Ptr<char> (ACE_WString (WIDE_STRING).char_rep ()).get () -#define ASYS_ONLY_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING -#endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ +# define ASYS_ONLY_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING +# endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ #else -#define ACE_WIDE_STRING(ASCII_STRING) ASCII_STRING -#define ACE_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING -#define ACE_TEXT_STRING ACE_CString -#define ASYS_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING -#define ASYS_ONLY_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING +# define ACE_WIDE_STRING(ASCII_STRING) ASCII_STRING +# define ACE_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING +# define ACE_TEXT_STRING ACE_CString +# define ASYS_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING +# define ASYS_ONLY_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING #endif /* UNICODE */ #if defined (ACE_HAS_MOSTLY_UNICODE_APIS) -#define ASYS_WIDE_STRING(ASCII_STRING) ACE_WString (ASCII_STRING).fast_rep () +# define ASYS_WIDE_STRING(ASCII_STRING) ACE_WString (ASCII_STRING).fast_rep () #else -#define ASYS_WIDE_STRING(ASCII_STRING) ASCII_STRING +# define ASYS_WIDE_STRING(ASCII_STRING) ASCII_STRING #endif /* ACE_HAS_MOSTLY_UNICODE_APIS */ #endif /* ACE_OS_H */ |