summaryrefslogtreecommitdiff
path: root/ACE/ace/os_include/sys
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-09-15 12:49:15 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-09-15 12:49:15 +0000
commitf9d45d7052db2859a7f51a2e7cd992e11c7e4593 (patch)
treeb0a7bbaec7724a8d7466c1494f04a85aff384efe /ACE/ace/os_include/sys
parentb5806644eacb0e0bc9b7ea1fb3d4b3603b362340 (diff)
downloadATCD-f9d45d7052db2859a7f51a2e7cd992e11c7e4593.tar.gz
Wed Sep 15 12:45:13 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Auto_Event.h: * ace/OS_NS_arpa_inet.inl: * ace/OS_NS_arpa_inet.cpp: * ace/OS_NS_errno.cpp: * ace/OS_NS_fcntl.cpp: * ace/OS_NS_math.cpp: * ace/OS_NS_pwd.inl: * ace/OS_NS_pwd.cpp: * ace/OS_NS_regex.inl: * ace/OS_NS_regex.cpp: * ace/OS_NS_signal.cpp: * ace/OS_NS_sys_resource.cpp: * ace/OS_NS_sys_wait.inl: * ace/OS_NS_wctype.inl: * ace/OS_NS_wctype.cpp: * ace/config-tandem.h: * ace/os_include/os_pthread.h: * ace/os_include/os_signal.h: * ace/os_include/sys/os_resource.h: * ace/os_include/sys/os_socket.h: Small cleanup and layout changes
Diffstat (limited to 'ACE/ace/os_include/sys')
-rw-r--r--ACE/ace/os_include/sys/os_resource.h4
-rw-r--r--ACE/ace/os_include/sys/os_socket.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/os_include/sys/os_resource.h b/ACE/ace/os_include/sys/os_resource.h
index a68ac79338b..5ec68e752de 100644
--- a/ACE/ace/os_include/sys/os_resource.h
+++ b/ACE/ace/os_include/sys/os_resource.h
@@ -52,13 +52,13 @@ extern "C"
// There must be a better way to do this...
#if !defined (RLIMIT_NOFILE) && !defined (ACE_LACKS_RLIMIT_NOFILE)
-# if defined (linux) || defined (AIX) || defined (SCO)
+# if defined (linux) || defined (AIX)
# if defined (RLIMIT_OFILE)
# define RLIMIT_NOFILE RLIMIT_OFILE
# else
# define RLIMIT_NOFILE 200
# endif /* RLIMIT_OFILE */
-# endif /* defined (linux) || defined (AIX) || defined (SCO) */
+# endif /* defined (linux) || defined (AIX) */
#endif /* RLIMIT_NOFILE */
#if defined (ACE_WIN32)
diff --git a/ACE/ace/os_include/sys/os_socket.h b/ACE/ace/os_include/sys/os_socket.h
index a1d7999ae81..9cf7a2208e0 100644
--- a/ACE/ace/os_include/sys/os_socket.h
+++ b/ACE/ace/os_include/sys/os_socket.h
@@ -40,7 +40,7 @@ extern "C"
{
#endif /* __cplusplus */
-#if !defined (ACE_HAS_MSG) && !defined (SCO)
+#if !defined (ACE_HAS_MSG)
struct msghdr {};
#endif /* ACE_HAS_MSG */