diff options
Diffstat (limited to 'ACE/ace/os_include')
| -rw-r--r-- | ACE/ace/os_include/os_pthread.h | 19 | ||||
| -rw-r--r-- | ACE/ace/os_include/os_stropts.h | 4 | ||||
| -rw-r--r-- | ACE/ace/os_include/os_unistd.h | 22 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_resource.h | 8 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_socket.h | 2 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_types.h | 2 |
6 files changed, 1 insertions, 56 deletions
diff --git a/ACE/ace/os_include/os_pthread.h b/ACE/ace/os_include/os_pthread.h index 74a9e2c8ba7..a789d117314 100644 --- a/ACE/ace/os_include/os_pthread.h +++ b/ACE/ace/os_include/os_pthread.h @@ -104,25 +104,6 @@ # if !defined (ACE_THR_PRI_OTHER_MAX) # define ACE_THR_PRI_OTHER_MAX (long) PRI_OTHER_MAX # endif /* !ACE_THR_PRI_OTHER_MAX */ -# elif defined (sun) -# if !defined (ACE_THR_PRI_FIFO_MIN) -# define ACE_THR_PRI_FIFO_MIN (long) 0 -# endif /* !ACE_THR_PRI_FIFO_MIN */ -# if !defined (ACE_THR_PRI_FIFO_MAX) -# define ACE_THR_PRI_FIFO_MAX (long) 59 -# endif /* !ACE_THR_PRI_FIFO_MAX */ -# if !defined (ACE_THR_PRI_RR_MIN) -# define ACE_THR_PRI_RR_MIN (long) 0 -# endif /* !ACE_THR_PRI_RR_MIN */ -# if !defined (ACE_THR_PRI_RR_MAX) -# define ACE_THR_PRI_RR_MAX (long) 59 -# endif /* !ACE_THR_PRI_RR_MAX */ -# if !defined (ACE_THR_PRI_OTHER_MIN) -# define ACE_THR_PRI_OTHER_MIN (long) 0 -# endif /* !ACE_THR_PRI_OTHER_MIN */ -# if !defined (ACE_THR_PRI_OTHER_MAX) -# define ACE_THR_PRI_OTHER_MAX (long) 127 -# endif /* !ACE_THR_PRI_OTHER_MAX */ # else # if !defined (ACE_THR_PRI_FIFO_MIN) # define ACE_THR_PRI_FIFO_MIN (long) ACE_PROC_PRI_FIFO_MIN diff --git a/ACE/ace/os_include/os_stropts.h b/ACE/ace/os_include/os_stropts.h index 1f9c841c968..7b641bee9da 100644 --- a/ACE/ace/os_include/os_stropts.h +++ b/ACE/ace/os_include/os_stropts.h @@ -24,10 +24,6 @@ #include "ace/os_include/os_unistd.h" -#if defined (ACE_HAS_TIMOD_H) -# include /**/ <sys/timod.h> -#endif /* ACE_HAS_TIMOD_H */ - #if !defined (ACE_LACKS_SYS_IOCTL_H) # include /**/ <sys/ioctl.h> #endif /* !ACE_LACKS_SYS_IOCTL_H */ diff --git a/ACE/ace/os_include/os_unistd.h b/ACE/ace/os_include/os_unistd.h index 50db68f0abd..e973f964741 100644 --- a/ACE/ace/os_include/os_unistd.h +++ b/ACE/ace/os_include/os_unistd.h @@ -33,10 +33,6 @@ # include /**/ <io.h> #endif /* ACE_HAS_IO_H */ -#if defined (ACE_HAS_SYS_SYSTEMINFO_H) -# include /**/ <sys/systeminfo.h> -#endif /* ACE_HAS_SYS_SYSTEMINFO_H */ - #if !defined (ACE_LACKS_UNISTD_H) # include /**/ <unistd.h> #endif /* !ACE_LACKS_UNISTD_H */ @@ -94,20 +90,6 @@ extern "C" # endif #endif /* ACE_WIN32 */ -#if (!defined (_BSD_SOURCE) && \ - !defined (_XOPEN_SOURCE) && !defined (_XOPEN_SOURCE_EXTENDED)) \ - || (defined (_XOPEN_SOURCE) && defined (__GNUC__)) - -# if defined (ACE_LACKS_SETREUID_PROTOTYPE) - extern int setreuid (uid_t ruid, uid_t euid); -# endif /* ACE_LACKS_SETREUID_PROTOTYPE */ - -# if defined (ACE_LACKS_SETREGID_PROTOTYPE) - extern int setregid (gid_t rgid, gid_t egid); -# endif /* ACE_LACKS_SETREGID_PROTOTYPE */ -#endif /* !_BSD_SOURCE && !_XOPEN_SOURCE && !_XOPEN_SOURCE_EXTENDED - || _XOPEN_SOURCE && __GNUC__ */ - // for use by access() # if !defined (R_OK) # define R_OK 04 /* Test for Read permission. */ @@ -130,10 +112,6 @@ extern "C" # define F_OK 0 /* Test for existence of File. */ # endif /* F_OK */ -#if defined (ACE_LACKS_UALARM_PROTOTYPE) - u_int ualarm (u_int usecs, u_int interval); -#endif /* ACE_LACKS_UALARM_PROTOTYPE */ - #if defined (ACE_LACKS_GETPGID_PROTOTYPE) && \ !defined (_XOPEN_SOURCE) && !defined (_XOPEN_SOURCE_EXTENDED) pid_t getpgid (pid_t pid); diff --git a/ACE/ace/os_include/sys/os_resource.h b/ACE/ace/os_include/sys/os_resource.h index 18b86d6809a..a014351617a 100644 --- a/ACE/ace/os_include/sys/os_resource.h +++ b/ACE/ace/os_include/sys/os_resource.h @@ -29,10 +29,6 @@ # include /**/ <sys/resource.h> #endif /* !ACE_LACKS_SYS_RESOURCE_H */ -#if defined (ACE_HAS_SYS_SYSTEMINFO_H) -# include /**/ <sys/systeminfo.h> -#endif /* ACE_HAS_SYS_SYSTEMINFO_H */ - #if defined (ACE_HAS_SYS_SYSCALL_H) # include /**/ <sys/syscall.h> #endif /* ACE_HAS_SYS_SYSCALL_H */ @@ -59,9 +55,7 @@ extern "C" }; #endif /* ACE_WIN32 */ -#if defined (ACE_HAS_PRUSAGE_T) - typedef prusage_t ACE_Rusage; -#elif defined (ACE_HAS_GETRUSAGE) +#if defined (ACE_HAS_GETRUSAGE) typedef rusage ACE_Rusage; #else typedef int ACE_Rusage; diff --git a/ACE/ace/os_include/sys/os_socket.h b/ACE/ace/os_include/sys/os_socket.h index 3ffee2e03b6..e3bd900fe15 100644 --- a/ACE/ace/os_include/sys/os_socket.h +++ b/ACE/ace/os_include/sys/os_socket.h @@ -255,9 +255,7 @@ extern "C" # define ACE_PROTOCOL_FAMILY_INET PF_INET #endif /* ACE_HAS_IPV6 */ -#if !defined (ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE) #define ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE SSIZE_MAX -#endif /* ACE_HAS_SOCK_BUF_SIZE_MAX_VALUE */ #if !defined (ACE_SOCKET_LEN) #if defined (ACE_HAS_SOCKLEN_T) diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index 6d43d51e49d..b179c7051ad 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -57,8 +57,6 @@ typedef double ACE_timer_t; typedef off_t ACE_LOFF_T; #elif defined (__QNX__) typedef off64_t ACE_LOFF_T; -#elif defined (__sun) - typedef offset_t ACE_LOFF_T; #elif defined (WIN32) typedef __int64 ACE_LOFF_T; #elif (defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x700)) || defined (ACE_LYNXOS_MAJOR) |