diff options
Diffstat (limited to 'ace/os_include')
31 files changed, 75 insertions, 64 deletions
diff --git a/ace/os_include/arpa/os_inet.h b/ace/os_include/arpa/os_inet.h index 34efdeed433..1ba2a0c1051 100644 --- a/ace/os_include/arpa/os_inet.h +++ b/ace/os_include/arpa/os_inet.h @@ -70,9 +70,9 @@ extern "C" unsigned long inet_network (const char *); #endif /* ! (ACE_VXWORKS) && ACE_VXWORKS <= 0x540 */ -#if defined (ACE_LACKS_INET_ATON_PROTOTYPE) +#if defined (__Lynx__) int inet_aton (const char *, struct in_addr *); -#endif /* ACE_LACKS_INET_ATON_PROTOTYPE */ +#endif /* __Lynx__ */ #ifdef __cplusplus } diff --git a/ace/os_include/os_errno.h b/ace/os_include/os_errno.h index 4c39bc04dfa..142b5338cfa 100644 --- a/ace/os_include/os_errno.h +++ b/ace/os_include/os_errno.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/os_float.h b/ace/os_include/os_float.h index 94cfb3dc5ef..b876600aa33 100644 --- a/ace/os_include/os_float.h +++ b/ace/os_include/os_float.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/os_inttypes.h b/ace/os_include/os_inttypes.h index 12ce23d9b8c..f01cf4b2803 100644 --- a/ace/os_include/os_inttypes.h +++ b/ace/os_include/os_inttypes.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/os_limits.h b/ace/os_include/os_limits.h index 27be31af2b4..0724e4c5ed3 100644 --- a/ace/os_include/os_limits.h +++ b/ace/os_include/os_limits.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -31,15 +31,9 @@ # include /**/ <limits.h> #endif /* !ACE_LACKS_LIMITS_H */ -#if !defined (ACE_LACKS_SYS_PARAM_H) +#if !defined (ACE_LACKS_PARAM_H) # include /**/ <sys/param.h> -#endif /* ACE_LACKS_SYS_PARAM_H */ - -// On VxWorks _POSIX_TIMER_MAX is defined in time.h, report this to WindRiver -// support. -#if defined (VXWORKS) -# include /**/ <time.h> -#endif /* VXWORKS */ +#endif /* ACE_LACKS_PARAM_H */ // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus diff --git a/ace/os_include/os_signal.h b/ace/os_include/os_signal.h index 45a1a0fddaf..86e619b41a0 100644 --- a/ace/os_include/os_signal.h +++ b/ace/os_include/os_signal.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/os_stdint.h b/ace/os_include/os_stdint.h index 3d9327ac99a..02fe7101725 100644 --- a/ace/os_include/os_stdint.h +++ b/ace/os_include/os_stdint.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/os_stdlib.h b/ace/os_include/os_stdlib.h index 5bcb77f430c..006272ef84c 100644 --- a/ace/os_include/os_stdlib.h +++ b/ace/os_include/os_stdlib.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -67,22 +67,21 @@ extern "C" int putenv (char *); // stdlib.h #endif /* ACE_PSOS_SNARFS_HEADER_INFO */ +// These prototypes are chronically lacking from many versions of +// UNIX. +#if !defined (ACE_WIN32) && defined (ACE_LACKS_MKTEMP) + char *mktemp (char *); +#endif /* !ACE_WIN32 && ACE_LACKS_MKTEMP */ #if defined (DIGITAL_UNIX) extern int _Prand_r (unsigned int *seedptr); #endif /* DIGITAL_UNIX */ -#if defined (ACE_LACKS_PUTENV_PROTOTYPE) +#if defined (__Lynx__) int putenv (char *); -#endif /* ACE_LACKS_PUTENV_PROTOTYPE */ - -#if defined (ACE_LACKS_MKTEMP_PROTOTYPE) char *mktemp (char *); -#endif /* ACE_LACKS_MKTEMP_PROTOTYPE */ - -#if defined (ACE_LACKS_MKSTEMP_PROTOTYPE) int mkstemp(char *); -#endif /* ACE_LACKS_MKSTEMP_PROTOTYPE */ +#endif /* __Lynx__ */ #ifdef __cplusplus } diff --git a/ace/os_include/os_strings.h b/ace/os_include/os_strings.h index 2fdcf723bec..850b21f60a5 100644 --- a/ace/os_include/os_strings.h +++ b/ace/os_include/os_strings.h @@ -36,13 +36,10 @@ extern "C" { #endif /* __cplusplus */ -#if defined (ACE_LACKS_STRCASECMP_PROTOTYPE) +#if defined (__Lynx__) int strcasecmp(const char *, const char *); -#endif /* ACE_LACKS_STRCASECMP_PROTOTYPE */ - -#if defined (ACE_LACKS_STRNCASECMP_PROTOTYPE) int strncasecmp(const char *, const char *, size_t); -#endif /* ACE_LACKS_STRNCASECMP_PROTOTYPE */ +#endif /* __Lynx__ */ #ifdef __cplusplus } diff --git a/ace/os_include/os_stropts.h b/ace/os_include/os_stropts.h index e28b672f560..d4113e49983 100644 --- a/ace/os_include/os_stropts.h +++ b/ace/os_include/os_stropts.h @@ -46,7 +46,7 @@ # include /**/ <sys/filio.h> #endif /* ACE_HAS_SYS_FILIO_H */ -#if defined (ACE_HAS_SYS_SOCKIO_H) +#if defined (ACE_HAS_SOCKIO_H) # include /**/ <sys/sockio.h> #endif /* ACE_HAS_SOCKIO_ */ diff --git a/ace/os_include/os_time.h b/ace/os_include/os_time.h index 80f49200187..17d945a7074 100644 --- a/ace/os_include/os_time.h +++ b/ace/os_include/os_time.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/os_ucontext.h b/ace/os_include/os_ucontext.h index dd4b5001ba9..67ce5ba9b10 100644 --- a/ace/os_include/os_ucontext.h +++ b/ace/os_include/os_ucontext.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/os_unistd.h b/ace/os_include/os_unistd.h index 8a9324cd741..5594604b260 100644 --- a/ace/os_include/os_unistd.h +++ b/ace/os_include/os_unistd.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -166,14 +166,11 @@ extern "C" # endif /* ACE_LACKS_TIMEDWAIT_PROTOTYPES */ -#if defined (ACE_LACKS_SWAB_PROTOTYPE) +#if defined (__Lynx__) void swab(const void *, void *, ssize_t); -#endif /* ACE_LACKS_SWAB_PROTOTYPE */ - -#if defined (ACE_LACKS_GETOPT_PROTOTYPE) int getopt(int, char * const [], const char *); -#endif /* ACE_LACKS_GETOPT_PROTOTYPE */ - +#endif /* __Lynx__ */ + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ace/os_include/sys/os_ipc.h b/ace/os_include/sys/os_ipc.h index ee5d198048e..3acd1ed78cc 100644 --- a/ace/os_include/sys/os_ipc.h +++ b/ace/os_include/sys/os_ipc.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_mman.h b/ace/os_include/sys/os_mman.h index 6ccb58d548f..d481cafaad8 100644 --- a/ace/os_include/sys/os_mman.h +++ b/ace/os_include/sys/os_mman.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_msg.h b/ace/os_include/sys/os_msg.h index e6b2c6c1c63..e5b4a0b4214 100644 --- a/ace/os_include/sys/os_msg.h +++ b/ace/os_include/sys/os_msg.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_resource.h b/ace/os_include/sys/os_resource.h index dd289b10a7a..8845e544782 100644 --- a/ace/os_include/sys/os_resource.h +++ b/ace/os_include/sys/os_resource.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -35,9 +35,9 @@ # include /**/ <sys/systeminfo.h> #endif /* ACE_HAS_SYS_INFO */ -#if defined (ACE_HAS_SYS_SYSCALL_H) +#if defined (ACE_HAS_SYSCALL_H) # include /**/ <sys/syscall.h> -#endif /* ACE_HAS_SYS_SYSCALL_H */ +#endif /* ACE_HAS_SYSCALL_H */ // prusage_t is defined in <sys/procfs.h> #if defined (ACE_HAS_PROC_FS) @@ -61,6 +61,12 @@ extern "C" # endif /* defined (linux) || defined (AIX) || defined (SCO) */ #endif /* RLIMIT_NOFILE */ +#if defined (ACE_HAS_BROKEN_SETRLIMIT) + typedef struct rlimit ACE_SETRLIMIT_TYPE; +#else + typedef const struct rlimit ACE_SETRLIMIT_TYPE; +#endif /* ACE_HAS_BROKEN_SETRLIMIT */ + #if defined (ACE_WIN32) # define RUSAGE_SELF 1 /// Fake the UNIX rusage structure. Perhaps we can add more to this @@ -92,7 +98,7 @@ extern "C" #if !defined (ACE_WIN32) // These prototypes are chronically lacking from many versions of // UNIX. -# if !defined (ACE_HAS_GETRUSAGE_PROTOTYPE) +# if !defined (ACE_HAS_GETRUSAGE_PROTO) int getrusage (int who, struct rusage *rusage); # endif /* ! ACE_HAS_GETRUSAGE_PROTO */ diff --git a/ace/os_include/sys/os_select.h b/ace/os_include/sys/os_select.h index f8da718e6a9..99f32bb4936 100644 --- a/ace/os_include/sys/os_select.h +++ b/ace/os_include/sys/os_select.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_sem.h b/ace/os_include/sys/os_sem.h index 93f669d2913..b0f3544dd26 100644 --- a/ace/os_include/sys/os_sem.h +++ b/ace/os_include/sys/os_sem.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_shm.h b/ace/os_include/sys/os_shm.h index af005e8dbb2..47c40660344 100644 --- a/ace/os_include/sys/os_shm.h +++ b/ace/os_include/sys/os_shm.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_socket.h b/ace/os_include/sys/os_socket.h index 938a71b39db..8f232a67b81 100644 --- a/ace/os_include/sys/os_socket.h +++ b/ace/os_include/sys/os_socket.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -50,6 +50,12 @@ extern "C" struct msghdr {}; #endif /* ACE_HAS_MSG */ +#if defined (ACE_HAS_BROKEN_SENDMSG) + typedef struct msghdr ACE_SENDMSG_TYPE; +#else + typedef const struct msghdr ACE_SENDMSG_TYPE; +#endif /* ACE_HAS_BROKEN_SENDMSG */ + #if defined (ACE_HAS_MSG) && defined (ACE_LACKS_MSG_ACCRIGHTS) # if !defined (msg_accrights) # undef msg_control @@ -196,7 +202,7 @@ extern "C" struct timespec *timeout); ssize_t sendmsg_timedwait (ACE_HANDLE handle, - const struct msghdr *msg, + ACE_SENDMSG_TYPE *msg, int flags, struct timespec *timeout); diff --git a/ace/os_include/sys/os_stat.h b/ace/os_include/sys/os_stat.h index 375a91714f4..1a9a357cf92 100644 --- a/ace/os_include/sys/os_stat.h +++ b/ace/os_include/sys/os_stat.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_statvfs.h b/ace/os_include/sys/os_statvfs.h index 546c20b10f2..e24c85daab8 100644 --- a/ace/os_include/sys/os_statvfs.h +++ b/ace/os_include/sys/os_statvfs.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_time.h b/ace/os_include/sys/os_time.h index 4fb260bcd7e..37edcd8d328 100644 --- a/ace/os_include/sys/os_time.h +++ b/ace/os_include/sys/os_time.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_timeb.h b/ace/os_include/sys/os_timeb.h index c3b3559269b..aa2102e8b95 100644 --- a/ace/os_include/sys/os_timeb.h +++ b/ace/os_include/sys/os_timeb.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_times.h b/ace/os_include/sys/os_times.h index c63b9e0098c..62e69921e7d 100644 --- a/ace/os_include/sys/os_times.h +++ b/ace/os_include/sys/os_times.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_types.h b/ace/os_include/sys/os_types.h index da7cb514c75..ee5999c5cbb 100644 --- a/ace/os_include/sys/os_types.h +++ b/ace/os_include/sys/os_types.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_uio.h b/ace/os_include/sys/os_uio.h index 1a7fd505c39..6c39c1e15b8 100644 --- a/ace/os_include/sys/os_uio.h +++ b/ace/os_include/sys/os_uio.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -63,15 +63,27 @@ extern "C" #endif /* __rtems__ */ +#if defined (ACE_HAS_BROKEN_WRITEV) + typedef struct iovec ACE_WRITEV_TYPE; +#else + typedef const struct iovec ACE_WRITEV_TYPE; +#endif /* ACE_HAS_BROKEN_WRITEV */ + +#if defined (ACE_HAS_BROKEN_READV) + typedef const struct iovec ACE_READV_TYPE; +#else + typedef struct iovec ACE_READV_TYPE; +#endif /* ACE_HAS_BROKEN_READV */ + # if defined (ACE_LACKS_TIMEDWAIT_PROTOTYPES) ssize_t readv_timedwait (ACE_HANDLE handle, - const iovec *iov, + iovec *iov, int iovcnt, struct timespec* timeout); ssize_t writev_timedwait (ACE_HANDLE handle, - const iovec *iov, + ACE_WRITEV_TYPE *iov, int iovcnt, struct timespec *timeout); diff --git a/ace/os_include/sys/os_un.h b/ace/os_include/sys/os_un.h index 1b2e5aca9ef..29e35fb8252 100644 --- a/ace/os_include/sys/os_un.h +++ b/ace/os_include/sys/os_un.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_utsname.h b/ace/os_include/sys/os_utsname.h index d707cbecc7d..906ae60dca6 100644 --- a/ace/os_include/sys/os_utsname.h +++ b/ace/os_include/sys/os_utsname.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/os_include/sys/os_wait.h b/ace/os_include/sys/os_wait.h index eb9f7e1d2de..8e6ec6e1624 100644 --- a/ace/os_include/sys/os_wait.h +++ b/ace/os_include/sys/os_wait.h @@ -18,7 +18,7 @@ #include /**/ "ace/pre.h" -#include "ace/config-lite.h" +#include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once |