diff options
| -rw-r--r-- | ace/OS.i | 10 | ||||
| -rw-r--r-- | ace/config-fsu-pthread.h | 47 | ||||
| -rw-r--r-- | ace/config-gcc-2.7.2.h | 11 | ||||
| -rw-r--r-- | ace/config-mit-pthread.h | 52 | ||||
| -rw-r--r-- | ace/config-sco-5.0.0-fsu-pthread.h | 155 | ||||
| -rw-r--r-- | ace/config-sco-5.0.0.h | 104 |
6 files changed, 226 insertions, 153 deletions
@@ -6258,10 +6258,18 @@ ACE_OS::open (const char *filename, if (h == ACE_INVALID_HANDLE) { - switch ((errno = ::GetLastError ())) + errno = ::GetLastError (); + + switch (errno) { case ERROR_FILE_EXISTS: errno = EEXIST; + break; + /* NOTREACHED */ + case ERROR_SHARING_VIOLATION: + errno = EACCES; + break; + /* NOTREACHED */ } } return h; diff --git a/ace/config-fsu-pthread.h b/ace/config-fsu-pthread.h new file mode 100644 index 00000000000..f401507fc8d --- /dev/null +++ b/ace/config-fsu-pthread.h @@ -0,0 +1,47 @@ +#if !defined (ACE_CONFIG_FSU_PTHREAD_H) +#define ACE_CONFIG_FSU_PTHREAD_H + +#define ACE_LACKS_CONST_TIMESPEC_PTR + +// Threads +#define ACE_HAS_THREADS +#if !defined(ACE_MT_SAFE) +#define ACE_MT_SAFE 1 +#endif + +#define ACE_HAS_PTHREADS +#define ACE_HAS_FSU_PTHREADS +#define ACE_HAS_THREAD_SPECIFIC_STORAGE +#define ACE_HAS_PTHREAD_T +#define ACE_HAS_SIGWAIT +#define ACE_HAS_ONEARG_SIGWAIT +#define ACE_HAS_PTHREAD_YIELD_VOID_PTR +#define ACE_HAS_YIELD_VOID_PTR +#define ACE_HAS_PTHREAD_ATTR_INIT +#define ACE_HAS_PTHREAD_ATTR_DESTROY +#define ACE_HAS_PTHREAD_DSTATE_PTR +#define ACE_HAS_PTHREAD_EQUAL +#define ACE_HAS_PTHREAD_GETSPECIFIC_DATAPTR +#define ACE_LACKS_THREAD_STACK_ADDR +#define ACE_LACKS_PTHREAD_THR_SIGSETMASK +#define ACE_LACKS_CONDATTR_PSHARED +#define ACE_LACKS_RWLOCK_T +#define ACE_LACKS_SETSCHED + +#define ACE_LACKS_TIMESPEC_T + +#include <pthread.h> + +#if !defined(PTHREAD_STACK_MIN) +#define PTHREAD_STACK_MIN (1024*10) +#endif + +#undef PTHREAD_INHERIT_SCHED + +struct sched_param +{ + int sched_priority; + int prio; +}; + +#endif /* ACE_CONFIG_FSU_PTHREAD_H */ diff --git a/ace/config-gcc-2.7.2.h b/ace/config-gcc-2.7.2.h new file mode 100644 index 00000000000..b545c4986db --- /dev/null +++ b/ace/config-gcc-2.7.2.h @@ -0,0 +1,11 @@ +#if !defined (ACE_CONFIG_GCC_2_7_2_H) +#define ACE_CONFIG_GCC_2_7_2_H + +#define ACE_TEMPLATES_REQUIRE_SOURCE +#define ACE_HAS_BROKEN_EXPLICIT_TEMPLATE_DESTRUCTOR +#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION +#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES + +#define ACE_HAS_GNU_CSTRING_H + +#endif /* ACE_CONFIG_GCC_2_7_2_H */ diff --git a/ace/config-mit-pthread.h b/ace/config-mit-pthread.h new file mode 100644 index 00000000000..a3f3a975801 --- /dev/null +++ b/ace/config-mit-pthread.h @@ -0,0 +1,52 @@ +#if !defined (ACE_CONFIG_MIT_PTHREAD_H) +#define ACE_CONFIG_MIT_PTHREAD_H + +// Platform uses int for select() rather than fd_set. +#if !defined(ACE_HAS_SELECT_H) +#define ACE_HAS_SELECT_H +#endif + +// Threads +#define ACE_HAS_THREADS +#if !defined (ACE_MT_SAFE) + #define ACE_MT_SAFE 1 +#endif +#define ACE_HAS_THREAD_SPECIFIC_STORAGE +#define ACE_HAS_PTHREADS +#define ACE_HAS_PTHREAD_T +#define ACE_LACKS_PTHREAD_CANCEL +#define ACE_HAS_PTHREAD_SIGMASK +#define ACE_HAS_SIGWAIT +//#define ACE_HAS_ONEARG_SIGWAIT +//#define ACE_HAS_PTHREAD_YIELD_VOID_PTR +//#define ACE_HAS_YIELD_VOID_PTR +//#define ACE_HAS_PTHREAD_ATTR_INIT +//#define ACE_HAS_PTHREAD_ATTR_DESTROY +//#define ACE_HAS_PTHREAD_DSTATE_PTR +//#define ACE_HAS_PTHREAD_EQUAL +//#define ACE_HAS_PTHREAD_GETSPECIFIC_DATAPTR +#define ACE_LACKS_THREAD_PROCESS_SCOPING +//#define ACE_LACKS_THREAD_STACK_ADDR +//#define ACE_LACKS_KEYDELETE +#define ACE_LACKS_CONDATTR_PSHARED +#define ACE_LACKS_RWLOCK_T +#define ACE_LACKS_SETSCHED + +#include <pthread.h> +#if defined(_M_UNIX) +#include <sys/regset.h> +#endif + +#define ACE_LACKS_TIMEDWAIT_PROTOTYPES +#define ACE_HAS_RECV_TIMEDWAIT +#define ACE_HAS_RECVFROM_TIMEDWAIT +#define ACE_HAS_RECVMSG_TIMEDWAIT +#define ACE_HAS_SEND_TIMEDWAIT +#define ACE_HAS_SENDTO_TIMEDWAIT +#define ACE_HAS_SENDMSG_TIMEDWAIT +#define ACE_HAS_READ_TIMEDWAIT +#define ACE_HAS_READV_TIMEDWAIT +#define ACE_HAS_WRITE_TIMEDWAIT +#define ACE_HAS_WRITEV_TIMEDWAIT + +#endif /* ACE_CONFIG_MIT_PTHREAD_H */ diff --git a/ace/config-sco-5.0.0-fsu-pthread.h b/ace/config-sco-5.0.0-fsu-pthread.h index e8f3f61304f..b7b7caef73b 100644 --- a/ace/config-sco-5.0.0-fsu-pthread.h +++ b/ace/config-sco-5.0.0-fsu-pthread.h @@ -1,157 +1,8 @@ -/* -*- C++ -*- */ -// $Id$ - -// The following configuration file is designed to work for SCO UNIX -// 5.0 with Florida State pthreads. - #if !defined (ACE_CONFIG_H) #define ACE_CONFIG_H -// Compiling for SCO. -#if !defined (SCO) -#define SCO -#endif /* SCO */ - -#if defined (SCO) && !defined (MAXPATHLEN) -#define MAXPATHLEN 1023 -#endif /* SCO */ - -// Optimize ACE_Handle_Set for select(). -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT - -#define ACE_HAS_SIG_MACROS -#define ACE_TEMPLATES_REQUIRE_SOURCE -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - -#define ACE_LACKS_SYSCALL -#define ACE_LACKS_STRRECVFD -#define ACE_NEEDS_FTRUNCATE -#define ACE_LACKS_RLIMIT -#define ACE_LACKS_MADVISE -#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - -// Compiler doesn't support static data member templates. -//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES - -// Platform supports System V IPC (most versions of UNIX, but not Win32) -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_NONCONST_MSGSND -// #define ACE_LACKS_POSIX_PROTOTYPES -#define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_HAS_AUTOMATIC_INIT_FINI - -// Platform supports Term Ioctls -#define ACE_HAS_TERM_IOCTLS - -// Platform supports recvmsg and sendmsg. -// #define ACE_HAS_MSG -#define ACE_LACKS_RPC_H - -// Compiler/platform contains the <sys/syscall.h> file. -//#define ACE_HAS_SYSCALL_H - -// Fixes a problem with HP/UX not wrapping the mmap(2) header files -// with extern "C". -//#define ACE_HAS_BROKEN_MMAP_H - -// Prototypes for both signal() and struct sigaction are consistent. -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES - -// Compiler/platform has correctly prototyped header files. -#define ACE_HAS_CPLUSPLUS_HEADERS - -// Header files lack t_errno for ACE_TLI. -//#define ACE_LACKS_T_ERRNO - -// Compiler/platform supports poll(). -// #define ACE_HAS_POLL - -// Platform supports POSIX O_NONBLOCK semantics. -#define ACE_HAS_POSIX_NONBLOCK - -// Compiler/platform defines the sig_atomic_t typedef -#define ACE_HAS_SIG_ATOMIC_T - -// Compiler supports the ssize_t typedef. -//#define ACE_HAS_SSIZE_T - -// Defines the page size of the system. -#define ACE_PAGE_SIZE 4096 - -// Compiler/platform supports strerror (). -#define ACE_HAS_STRERROR - -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY - -// HP/UX has an undefined syscall for GETRUSAGE... -//#define ACE_HAS_SYSCALL_GETRUSAGE - -// Note, this only works if the flag is set above! -//#define ACE_HAS_GETRUSAGE - -// Platform uses int for select() rather than fd_set. -#define ACE_HAS_SELECT_H - -// Platform has prototypes for ACE_TLI. -//#define ACE_HAS_TLI_PROTOTYPES -// Platform has the XLI version of ACE_TLI. -// #define ACE_HAS_XLI - -#define ACE_HAS_GNU_CSTRING_H - -// Turns off the tracing feature. -#if !defined (ACE_NTRACE) -#define ACE_NTRACE 1 -#endif /* ACE_NTRACE */ - -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_UCONTEXT_T - -#define ACE_NEEDS_SYSTIME_H -#define ACE_LACKS_STRCASECMP - -// Threads -#define ACE_HAS_THREADS -#if !defined(ACE_MT_SAFE) -#define ACE_MT_SAFE 1 -#endif - -#define ACE_HAS_PTHREADS -#define ACE_HAS_FSU_PTHREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_PTHREAD_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_ONEARG_SIGWAIT -#define ACE_HAS_PTHREAD_YIELD_VOID_PTR -#define ACE_HAS_YIELD_VOID_PTR -#define ACE_HAS_PTHREAD_ATTR_INIT -#define ACE_HAS_PTHREAD_ATTR_DESTROY -#define ACE_HAS_PTHREAD_DSTATE_PTR -#define ACE_HAS_PTHREAD_EQUAL -#define ACE_HAS_PTHREAD_GETSPECIFIC_DATAPTR -#define ACE_LACKS_THREAD_STACK_ADDR -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SETSCHED - -#define ACE_HAS_POSIX_TIME -#define ACE_LACKS_TIMESPEC_T -#define ACE_HAS_IP_MULTICAST - -#include <pthread.h> - -#if !defined (PTHREAD_STACK_MIN) -#define PTHREAD_STACK_MIN (1024*10) -#endif /* PTHREAD_STACK_MIN */ - -#undef PTHREAD_INHERIT_SCHED - -struct sched_param -{ - int sched_priority; - int prio; -}; +#include "ace/config-gcc-2.7.2.h" +#include "ace/config-sco-5.0.0.h" +#include "ace/config-fsu-pthread.h" #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sco-5.0.0.h b/ace/config-sco-5.0.0.h new file mode 100644 index 00000000000..50e034852ea --- /dev/null +++ b/ace/config-sco-5.0.0.h @@ -0,0 +1,104 @@ +#if !defined (ACE_CONFIG_SCO_5_0_0_H) +#define ACE_CONFIG_SCO_5_0_0_H + +// Compiling for SCO. +#if !defined (SCO) +#define SCO +#endif /* SCO */ + +#if defined (SCO) && !defined (MAXPATHLEN) +#define MAXPATHLEN 1023 +#endif /* SCO */ + +#define ACE_HAS_SIG_MACROS +#define ACE_LACKS_CONST_TIMESPEC_PTR +#define ACE_LACKS_SYSCALL +#define ACE_LACKS_STRRECVFD +#define ACE_NEEDS_FTRUNCATE +#define ACE_LACKS_RLIMIT +#define ACE_LACKS_MADVISE +#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS + +// Compiler doesn't support static data member templates. +//#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES + +// Platform supports System V IPC (most versions of UNIX, but not Win32) +#define ACE_HAS_SYSV_IPC +#define ACE_HAS_NONCONST_MSGSND +#define ACE_HAS_LONG_FDMASK +// #define ACE_LACKS_POSIX_PROTOTYPES +#define ACE_HAS_SVR4_DYNAMIC_LINKING +#define ACE_HAS_AUTOMATIC_INIT_FINI + +// Platform supports Term Ioctls +#define ACE_HAS_TERM_IOCTLS + +// Platform supports recvmsg and sendmsg. +// #define ACE_HAS_MSG +#define ACE_LACKS_RPC_H + +// Compiler/platform contains the <sys/syscall.h> file. +//#define ACE_HAS_SYSCALL_H + +// Fixes a problem with HP/UX not wrapping the mmap(2) header files +// with extern "C". +//#define ACE_HAS_BROKEN_MMAP_H + +// Prototypes for both signal() and struct sigaction are consistent. +#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES + +// Compiler/platform has correctly prototyped header files. +#define ACE_HAS_CPLUSPLUS_HEADERS + +// Header files lack t_errno for ACE_TLI. +//#define ACE_LACKS_T_ERRNO + +// Compiler/platform supports poll(). +// #define ACE_HAS_POLL + +// Platform supports POSIX O_NONBLOCK semantics. +#define ACE_HAS_POSIX_NONBLOCK + +// Compiler/platform defines the sig_atomic_t typedef +#define ACE_HAS_SIG_ATOMIC_T + +// Compiler supports the ssize_t typedef. +//#define ACE_HAS_SSIZE_T + +// Defines the page size of the system. +#define ACE_PAGE_SIZE 4096 + +// Compiler/platform supports strerror (). +#define ACE_HAS_STRERROR + +#define ACE_HAS_TIMEZONE_GETTIMEOFDAY + +// HP/UX has an undefined syscall for GETRUSAGE... +//#define ACE_HAS_SYSCALL_GETRUSAGE + +// Note, this only works if the flag is set above! +//#define ACE_HAS_GETRUSAGE + +// Platform uses int for select() rather than fd_set. +#define ACE_HAS_SELECT_H + +// Platform has prototypes for ACE_TLI. +//#define ACE_HAS_TLI_PROTOTYPES +// Platform has the XLI version of ACE_TLI. +// #define ACE_HAS_XLI + +// Turns off the tracing feature. +#if !defined (ACE_NTRACE) +#define ACE_NTRACE 1 +#endif /* ACE_NTRACE */ + +#define ACE_HAS_SIGINFO_T +#define ACE_HAS_UCONTEXT_T + +#define ACE_NEEDS_SYSTIME_H +#define ACE_LACKS_STRCASECMP + +#define ACE_HAS_POSIX_TIME +#define ACE_HAS_IP_MULTICAST + +#endif /* ACE_CONFIG_SCO_5_0_0_H */ |