summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE/ChangeLog24
-rw-r--r--ACE/ace/Auto_Event.h2
-rw-r--r--ACE/ace/OS_NS_arpa_inet.cpp2
-rw-r--r--ACE/ace/OS_NS_arpa_inet.inl4
-rw-r--r--ACE/ace/OS_NS_errno.cpp2
-rw-r--r--ACE/ace/OS_NS_fcntl.cpp2
-rw-r--r--ACE/ace/OS_NS_math.cpp2
-rw-r--r--ACE/ace/OS_NS_pwd.cpp2
-rw-r--r--ACE/ace/OS_NS_pwd.inl3
-rw-r--r--ACE/ace/OS_NS_regex.cpp2
-rw-r--r--ACE/ace/OS_NS_regex.inl1
-rw-r--r--ACE/ace/OS_NS_signal.cpp5
-rw-r--r--ACE/ace/OS_NS_sys_resource.cpp2
-rw-r--r--ACE/ace/OS_NS_sys_wait.inl6
-rw-r--r--ACE/ace/OS_NS_wctype.cpp2
-rw-r--r--ACE/ace/OS_NS_wctype.inl1
-rw-r--r--ACE/ace/config-tandem.h2
-rw-r--r--ACE/ace/os_include/os_pthread.h5
-rw-r--r--ACE/ace/os_include/os_signal.h6
-rw-r--r--ACE/ace/os_include/sys/os_resource.h4
-rw-r--r--ACE/ace/os_include/sys/os_socket.h2
21 files changed, 36 insertions, 45 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 18c22d66ccb..168c39031c7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,27 @@
+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
+
Wed Sep 15 12:31:07 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* protocols/tests/HTBP/Reactor_Tests/server.cpp:
diff --git a/ACE/ace/Auto_Event.h b/ACE/ace/Auto_Event.h
index c4ee11509bb..64bc69e6d27 100644
--- a/ACE/ace/Auto_Event.h
+++ b/ACE/ace/Auto_Event.h
@@ -32,7 +32,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
* @brief Auto Events.
*
* Specialization of Event mechanism which wakes up one waiting
- * thread on <signal>. All platforms support process-scope locking
+ * thread on @c signal. All platforms support process-scope locking
* support. However, only Win32 platforms support global naming and
* system-scope locking support.
*/
diff --git a/ACE/ace/OS_NS_arpa_inet.cpp b/ACE/ace/OS_NS_arpa_inet.cpp
index a5d9e0e019e..2c3275dc2f0 100644
--- a/ACE/ace/OS_NS_arpa_inet.cpp
+++ b/ACE/ace/OS_NS_arpa_inet.cpp
@@ -3,8 +3,6 @@
#include "ace/OS_NS_arpa_inet.h"
-
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_arpa_inet.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/ACE/ace/OS_NS_arpa_inet.inl b/ACE/ace/OS_NS_arpa_inet.inl
index e90493dbda2..9722d949318 100644
--- a/ACE/ace/OS_NS_arpa_inet.inl
+++ b/ACE/ace/OS_NS_arpa_inet.inl
@@ -29,9 +29,7 @@ ACE_OS::inet_ntoa (const struct in_addr addr)
ACE_UNUSED_ARG (addr);
ACE_NOTSUP_RETURN (0);
#else
- ACE_OSCALL_RETURN (::inet_ntoa (addr),
- char *,
- 0);
+ ACE_OSCALL_RETURN (::inet_ntoa (addr), char *, 0);
#endif
}
diff --git a/ACE/ace/OS_NS_errno.cpp b/ACE/ace/OS_NS_errno.cpp
index 7b9e27f8958..6c37f79063e 100644
--- a/ACE/ace/OS_NS_errno.cpp
+++ b/ACE/ace/OS_NS_errno.cpp
@@ -3,8 +3,6 @@
#include "ace/OS_NS_errno.h"
-
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_errno.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/ACE/ace/OS_NS_fcntl.cpp b/ACE/ace/OS_NS_fcntl.cpp
index 94de50f8e26..1276c1004df 100644
--- a/ACE/ace/OS_NS_fcntl.cpp
+++ b/ACE/ace/OS_NS_fcntl.cpp
@@ -2,8 +2,6 @@
#include "ace/OS_NS_fcntl.h"
-
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_fcntl.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/ACE/ace/OS_NS_math.cpp b/ACE/ace/OS_NS_math.cpp
index e1a7997708b..ef44bde63e5 100644
--- a/ACE/ace/OS_NS_math.cpp
+++ b/ACE/ace/OS_NS_math.cpp
@@ -2,8 +2,6 @@
#include "ace/OS_NS_math.h"
-
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_math.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/ACE/ace/OS_NS_pwd.cpp b/ACE/ace/OS_NS_pwd.cpp
index 3e84df2ba7b..9e981704b5d 100644
--- a/ACE/ace/OS_NS_pwd.cpp
+++ b/ACE/ace/OS_NS_pwd.cpp
@@ -2,8 +2,6 @@
#include "ace/OS_NS_pwd.h"
-
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_pwd.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl
index a6f1667a398..99ece415aa5 100644
--- a/ACE/ace/OS_NS_pwd.inl
+++ b/ACE/ace/OS_NS_pwd.inl
@@ -57,8 +57,7 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent,
# if !defined (ACE_LACKS_PWD_REENTRANT_FUNCTIONS)
# if defined (ACE_HAS_PTHREADS) && \
!defined (ACE_HAS_STHREADS) || \
- defined (HPUX_11) || \
- defined (__USLC__) // Added by Roland Gigler for SCO UnixWare 7.
+ defined (HPUX_11)
struct passwd *result = 0;
int status;
// VAC++ doesn't correctly grok the ::getpwnam_r - the function is redefined
diff --git a/ACE/ace/OS_NS_regex.cpp b/ACE/ace/OS_NS_regex.cpp
index da5c5805112..38920fc5ca0 100644
--- a/ACE/ace/OS_NS_regex.cpp
+++ b/ACE/ace/OS_NS_regex.cpp
@@ -2,8 +2,6 @@
#include "ace/OS_NS_regex.h"
-
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_regex.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/ACE/ace/OS_NS_regex.inl b/ACE/ace/OS_NS_regex.inl
index 884bd88c718..5cfcaf9625b 100644
--- a/ACE/ace/OS_NS_regex.inl
+++ b/ACE/ace/OS_NS_regex.inl
@@ -1,5 +1,4 @@
// -*- C++ -*-
-//
// $Id$
#include "ace/OS_NS_errno.h"
diff --git a/ACE/ace/OS_NS_signal.cpp b/ACE/ace/OS_NS_signal.cpp
index 78d100b38a8..0917152ca67 100644
--- a/ACE/ace/OS_NS_signal.cpp
+++ b/ACE/ace/OS_NS_signal.cpp
@@ -2,12 +2,12 @@
#include "ace/OS_NS_signal.h"
-
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_signal.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
#if !defined (ACE_HAS_SIGINFO_T)
siginfo_t::siginfo_t (ACE_HANDLE handle)
: si_handle_ (handle),
@@ -22,5 +22,4 @@ siginfo_t::siginfo_t (ACE_HANDLE *handles)
}
#endif /* ACE_HAS_SIGINFO_T */
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_NS_sys_resource.cpp b/ACE/ace/OS_NS_sys_resource.cpp
index 71cfe323afe..d0b288bc6a5 100644
--- a/ACE/ace/OS_NS_sys_resource.cpp
+++ b/ACE/ace/OS_NS_sys_resource.cpp
@@ -2,8 +2,6 @@
#include "ace/OS_NS_sys_resource.h"
-
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_sys_resource.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/ACE/ace/OS_NS_sys_wait.inl b/ACE/ace/OS_NS_sys_wait.inl
index 2503d509828..969a9b7a5fc 100644
--- a/ACE/ace/OS_NS_sys_wait.inl
+++ b/ACE/ace/OS_NS_sys_wait.inl
@@ -57,15 +57,13 @@ ACE_OS::waitpid (pid_t pid,
// Don't try to get the process exit status if wait failed so we can
// keep the original error code intact.
- switch (::WaitForSingleObject (phandle,
- blocking_period))
+ switch (::WaitForSingleObject (phandle, blocking_period))
{
case WAIT_OBJECT_0:
if (status != 0)
// The error status of <GetExitCodeProcess> is nonetheless
// not tested because we don't know how to return the value.
- ::GetExitCodeProcess (phandle,
- status);
+ ::GetExitCodeProcess (phandle, status);
break;
case WAIT_TIMEOUT:
errno = ETIME;
diff --git a/ACE/ace/OS_NS_wctype.cpp b/ACE/ace/OS_NS_wctype.cpp
index 45dfaa4cc6c..fe2a5acffbb 100644
--- a/ACE/ace/OS_NS_wctype.cpp
+++ b/ACE/ace/OS_NS_wctype.cpp
@@ -3,8 +3,6 @@
#include "ace/OS_NS_wctype.h"
-
-
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/OS_NS_wctype.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/ACE/ace/OS_NS_wctype.inl b/ACE/ace/OS_NS_wctype.inl
index 9fc6321e64a..0004df19bca 100644
--- a/ACE/ace/OS_NS_wctype.inl
+++ b/ACE/ace/OS_NS_wctype.inl
@@ -1,5 +1,4 @@
// -*- C++ -*-
-//
// $Id$
#if defined (ACE_LACKS_ISWCTYPE)
diff --git a/ACE/ace/config-tandem.h b/ACE/ace/config-tandem.h
index bb52027e094..957e0b3fdb6 100644
--- a/ACE/ace/config-tandem.h
+++ b/ACE/ace/config-tandem.h
@@ -154,7 +154,6 @@
// Compiler/platform has threadspecific storage
#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-//Platform supports thr_keydelete (e.g,. UNIXWARE)
#define ACE_HAS_THR_MINSTACK // Tandem uses thr_minstack instead of thr_min_stack
#define ACE_LACKS_PRI_T // Tandem lacks pri_t
@@ -181,7 +180,6 @@
#define ACE_HAS_STANDARD_CPP_LIBRARY
//Platform lacks madvise() (e.g., Linux)
#define ACE_LACKS_MADVISE
-//Compiler/platform lacks strcasecmp() (e.g., DG/UX, UNIXWARE, VXWORKS)
#define ACE_LACKS_STRCASECMP
// Defines the page size of the system.
diff --git a/ACE/ace/os_include/os_pthread.h b/ACE/ace/os_include/os_pthread.h
index 6a5871777e9..dc996517b3a 100644
--- a/ACE/ace/os_include/os_pthread.h
+++ b/ACE/ace/os_include/os_pthread.h
@@ -89,8 +89,7 @@
# else
# define ACE_PROC_PRI_OTHER_MIN (sched_get_priority_min(SCHED_OTHER))
# endif /* HPUX */
-# else /* UNICOS is missing a sched_get_priority_min() implementation,
- SCO too */
+# else /* UNICOS is missing a sched_get_priority_min() implementation */
# define ACE_PROC_PRI_FIFO_MIN 0
# define ACE_PROC_PRI_RR_MIN 0
# define ACE_PROC_PRI_OTHER_MIN 0
@@ -105,7 +104,7 @@
# else
# define ACE_PROC_PRI_OTHER_MAX (sched_get_priority_max(SCHED_OTHER))
# endif /* HPUX */
-# else /* SCO missing sched_get_priority_max() implementation */
+# else
# define ACE_PROC_PRI_FIFO_MAX 59
# define ACE_PROC_PRI_RR_MAX 59
# define ACE_PROC_PRI_OTHER_MAX 59
diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h
index f2bb0c35278..0f9280486e3 100644
--- a/ACE/ace/os_include/os_signal.h
+++ b/ACE/ace/os_include/os_signal.h
@@ -32,12 +32,6 @@
}
#endif /* !ACE_LACKS_SIGNAL_H */
-// This must come after signal.h is #included.
-#if defined (SCO)
-# define SIGIO SIGPOLL
-# include /**/ <sys/regset.h>
-#endif /* SCO */
-
#if defined (ACE_HAS_SIGINFO_T)
# if !defined (ACE_LACKS_SIGINFO_H)
# if defined (__QNX__) || defined (__OpenBSD__) || defined (__INTERIX)
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 */
View Lorry Controller Status