diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-02 10:53:07 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-02-02 10:53:07 +0000 |
| commit | 1f6099cd974ff9d388c6d53ab19aee2f21002a37 (patch) | |
| tree | 42c7ec8a65d47154539c304b9c0426cf8300b018 /ACE/ace | |
| parent | 70f31f8df1129d39f91a876ff9227ca29e49e085 (diff) | |
| download | ATCD-1f6099cd974ff9d388c6d53ab19aee2f21002a37.tar.gz | |
ChangeLogTag: Fri Feb 2 10:47:55 UTC 2007 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/Proactor.cpp | 3 | ||||
| -rw-r--r-- | ACE/ace/config-lynxos.h | 14 | ||||
| -rw-r--r-- | ACE/ace/os_include/net/os_if.h | 5 |
3 files changed, 4 insertions, 18 deletions
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index da46649dc33..9d529243604 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -11,9 +11,10 @@ #include "ace/Proactor_Impl.h" #include "ace/Object_Manager.h" #include "ace/Task_T.h" + #if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_SVCCONF) # include "ace/Service_Config.h" -# endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ +#endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ ACE_RCSID (ace, diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h index 99b6e42bc6f..f1d743c3640 100644 --- a/ACE/ace/config-lynxos.h +++ b/ACE/ace/config-lynxos.h @@ -18,7 +18,6 @@ // Compile using multi-thread libraries. #if !defined (ACE_MT_SAFE) # define ACE_MT_SAFE 1 -# define _REENTRANT #endif #include "ace/config-posix.h" @@ -38,6 +37,7 @@ #define ACE_HAS_ALLOCA #define ACE_HAS_ALLOCA_H #define ACE_HAS_AUTOMATIC_INIT_FINI +#define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1 #define ACE_HAS_BROKEN_SIGEVENT_STRUCT #define ACE_HAS_CHARPTR_SHMAT #define ACE_HAS_CHARPTR_SHMDT @@ -97,8 +97,8 @@ #define ACE_LACKS_VSNPRINTF #define ACE_LACKS_WCHAR_H #define ACE_MALLOC_ALIGN 8 -#define ACE_NEEDS_IPC_1C_H #define ACE_PAGE_SIZE 4096 +#define ACE_POSIX_SIG_PROACTOR #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR #if ACE_MT_SAFE == 1 @@ -113,16 +113,6 @@ # endif #endif /* ACE_MT_SAFE */ -#define ACE_POSIX_AIOCB_PROACTOR -// AIOCB Proactor works on Lynx. But it is not multi-threaded. -// Lynx OS 3.0.0 lacks POSIX call <pthread_sigmask>. So,we cannot use -// SIG Proactor also, with multiple threads. So, let us use the AIOCB -// Proactor. Once <pthreadd_sigmask> is available on Lynx, we can turn -// on SIG Proactor for this platform. -// #define ACE_POSIX_SIG_PROACTOR - -#define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1 - #if __GNUC__ < 3 # define ACE_LACKS_NUMERIC_LIMITS #endif /* __GNUC__ < 3 */ diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index c689e07ab7e..bb44c58504c 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -24,11 +24,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_NEEDS_IPC_1C_H) - // LynxOS 3.1.0 and later need this -# include /**/ <ipc_1c.h> -#endif /* ACE_NEEDS_IPC_1C_H */ - #if !defined (ACE_LACKS_NET_IF_H) // This part if to avoid STL name conflict with the map structure // in net/if.h. |