diff options
| -rw-r--r-- | ace/OS.h | 17 | ||||
| -rw-r--r-- | ace/OS.i | 9 | ||||
| -rw-r--r-- | ace/README | 3 | ||||
| -rw-r--r-- | ace/config-chorus.h | 1 | ||||
| -rw-r--r-- | ace/config-cygwin32-common.h | 1 | ||||
| -rw-r--r-- | ace/config-psos-diab.h | 2 | ||||
| -rw-r--r-- | ace/config-psos-tm.h | 1 | ||||
| -rw-r--r-- | ace/config-psosim-g++.h | 1 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 1 |
9 files changed, 31 insertions, 5 deletions
@@ -1540,7 +1540,7 @@ if (gobbler != 0) *gobbler = (ACE_Service_Object_Exterminator) _gobble_##X; retu # if defined (ACE_LACKS_SEMBUF_T) struct sembuf { - u_short sem_num; // semaphore # + unsigned short sem_num; // semaphore # short sem_op; // semaphore operation short sem_flg; // operation flags }; @@ -3201,6 +3201,8 @@ extern "C" char **h_addr_list; /* (first, only) address from name server */ # define h_addr h_addr_list[0] /* the first address */ }; +# elif defined (ACE_HAS_CYGWIN32_SOCKET_H) +# include /**/ <cygwin32/socket.h> # else # if defined (ACE_HAS_STL_QUEUE_CONFLICT) # define queue _Queue_ @@ -3250,7 +3252,14 @@ unsigned long inet_network(const char *); # endif /* howmany */ # endif /* __Lynx__ */ -# if defined (CHORUS) +# if defined (CYGWIN32) +# include /**/ <sys/uio.h> +# include /**/ <sys/file.h> +# include /**/ <sys/time.h> +# include /**/ <sys/resource.h> +# include /**/ <sys/wait.h> +# include /**/ <pwd.h> +# elif defined (CHORUS) # include /**/ <chorus.h> # include /**/ <cx/select.h> # include /**/ <sys/uio.h> @@ -3717,6 +3726,10 @@ struct sigaction # define IP_ADD_MEMBERSHIP 0 # endif /* IP_ADD_MEMBERSHIP */ +# if !defined (SIOCGIFBRDADDR) +# define SIOCGIFBRDADDR 0 +# endif /* SIOCGIFBRDADDR */ + # if !defined (SIOCGIFADDR) # define SIOCGIFADDR 0 # endif /* SIOCGIFADDR */ @@ -590,13 +590,13 @@ ACE_INLINE int ACE_OS::mkfifo (const char *file, mode_t mode) { // ACE_TRACE ("ACE_OS::mkfifo"); -#if defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS) +#if defined (ACE_LACKS_MKFIFO) ACE_UNUSED_ARG (file); ACE_UNUSED_ARG (mode); ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::mkfifo (file, mode), int, -1); -# endif /* VXWORKS */ +# endif /* ACE_LACKS_MKFIFO */ } # if !defined (ACE_LACKS_MKTEMP) @@ -9096,6 +9096,11 @@ ACE_OS::ioctl (ACE_HANDLE handle, int cmd, void *val) int, -1); #elif defined (ACE_PSOS) ACE_OSCALL_RETURN (::ioctl (handle, cmd, (char *) val), int, -1); +#elif defined (__CYGWIN32__) + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (cmd); + ACE_UNUSED_ARG (val); + ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::ioctl (handle, cmd, val), int, -1); #endif /* ACE_WIN32 */ diff --git a/ace/README b/ace/README index 536cdbfcfaa..5c9b01436dd 100644 --- a/ace/README +++ b/ace/README @@ -235,6 +235,7 @@ ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES Prototypes for both signal() ACE_HAS_CPLUSPLUS_HEADERS Compiler/platform has correctly prototyped header files +ACE_HAS_CYGWIN32_SOCKET_H Platform has cygwin32 socket.h ACE_HAS_DIRENT Compiler/platform has Dirent iterator functions ACE_HAS_DLFCN_H_BROKEN_EXTERN_C For platforms, e.g., RedHat @@ -680,6 +681,8 @@ ACE_LACKS_MADVISE Platform lacks madvise() ACE_LACKS_MALLOC_H Platform lacks malloc.h ACE_LACKS_MEMORY_H Platform lacks memory.h (e.g., VxWorks and Chorus) +ACE_LACKS_MKFIFO Platform lacks mkfifo() e.g., + VxWorks, Chorus, pSoS, and WinNT. ACE_LACKS_MKTEMP ACE has no mktemp() ACE_LACKS_MMAP The platform doesn't have mmap(2) (e.g., SCO UNIX). diff --git a/ace/config-chorus.h b/ace/config-chorus.h index a0dcbcb91c9..f3fa85f382a 100644 --- a/ace/config-chorus.h +++ b/ace/config-chorus.h @@ -135,6 +135,7 @@ # define ACE_USE_RCSID 0 #endif /* #if !defined (ACE_USE_RCSID) */ +#define ACE_LACKS_MKFIFO #define ACE_HAS_TSS_EMULATION // Needed to wait for "processes" to exit. #include <am/await.h> diff --git a/ace/config-cygwin32-common.h b/ace/config-cygwin32-common.h index 3d10ff15e28..3c0906ecd7a 100644 --- a/ace/config-cygwin32-common.h +++ b/ace/config-cygwin32-common.h @@ -181,5 +181,6 @@ #if !defined (ACE_NTRACE) # define ACE_NTRACE 1 #endif /* ACE_NTRACE */ +#define ACE_LACKS_MKFIFO #endif /* ACE_LINUX_COMMON_H */ diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h index 502c47b416f..8ff98c7635b 100644 --- a/ace/config-psos-diab.h +++ b/ace/config-psos-diab.h @@ -203,5 +203,5 @@ #if !defined (ACE_PSOS_TBD) #define ACE_PSOS_TBD #endif /* ACE_PSOS_TBD */ - +#define ACE_LACKS_MKFIFO #endif /* ACE_CONFIG_H */ diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h index 787a7d7c7e1..e28ddf45022 100644 --- a/ace/config-psos-tm.h +++ b/ace/config-psos-tm.h @@ -200,5 +200,6 @@ #if !defined (ACE_PSOS_TBD) #define ACE_PSOS_TBD #endif /* ACE_PSOS_TBD */ +#define ACE_LACKS_MKFIFO #endif /* ACE_CONFIG_H */ diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h index bbb72cbebfa..95d4979d7d1 100644 --- a/ace/config-psosim-g++.h +++ b/ace/config-psosim-g++.h @@ -237,5 +237,6 @@ #if !defined (ACE_USE_RCSID) #define ACE_USE_RCSID 0 #endif /* #if !defined (ACE_USE_RCSID) */ +#define ACE_LACKS_MKFIFO #endif /* ACE_CONFIG_H */ diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index 650789b0661..5c6989ac8de 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -137,6 +137,7 @@ #endif /* ACE_NTRACE */ #define ACE_HAS_STRDUP_EMULATION +#define ACE_LACKS_MKFIFO // By default, don't include RCS Id strings in object code. #if !defined (ACE_USE_RCSID) |