summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ace/config-aix-4.1.x.h5
-rw-r--r--ace/config-dgux-4.11-epc.h19
-rw-r--r--ace/config-dgux-4.x-ghs.h8
-rw-r--r--ace/config-irix5.2.h45
-rw-r--r--ace/config-irix5.3-g++.h3
-rw-r--r--ace/config-irix5.3-sgic++.h52
-rw-r--r--ace/config-irix6.x-common.h9
-rw-r--r--ace/config-m88k.h17
-rw-r--r--ace/config-osf1-3.2.h9
-rw-r--r--ace/config-sunos5.4-centerline-2.x.h6
-rw-r--r--ace/config-sunos5.4-g++.h16
-rw-r--r--ace/config-sunos5.4-sunc++-4.x-orbix.h7
-rw-r--r--ace/config-sunos5.4-sunc++-4.x.h7
-rw-r--r--ace/config-sunos5.5.h1
-rw-r--r--ace/config-tandem.h7
-rw-r--r--ace/config-unixware-2.01-g++.h10
-rw-r--r--ace/config-unixware-2.1.2-g++.h14
17 files changed, 110 insertions, 125 deletions
diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h
index 8827e54abf3..4ed61e8d027 100644
--- a/ace/config-aix-4.1.x.h
+++ b/ace/config-aix-4.1.x.h
@@ -50,10 +50,9 @@
#define ACE_HAS_AUTOMATIC_INIT_FINI
#define ACE_HAS_CHARPTR_DL
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
#define ACE_HAS_THREADS
#if !defined (ACE_MT_SAFE)
- #define ACE_MT_SAFE 1
+# define ACE_MT_SAFE 1
#endif
#define ACE_HAS_UTIME
#define ACE_HAS_SELECT_H
@@ -138,5 +137,7 @@
#undef msg_controllen
#define msg_accrightslen msg_controllen
#endif /* msg_accrightslen */
+
#define ACE_HAS_UALARM
+
#endif /* ACE_CONFIG_H */
diff --git a/ace/config-dgux-4.11-epc.h b/ace/config-dgux-4.11-epc.h
index 4fd4ae3f3fe..35a6b0b68a4 100644
--- a/ace/config-dgux-4.11-epc.h
+++ b/ace/config-dgux-4.11-epc.h
@@ -7,6 +7,8 @@
#ifndef ACE_CONFIG_H
#define ACE_CONFIG_H
+#define ACE_DGUX
+
// Platform requires (struct sockaddr *) for msg_name field of struct
// msghdr.
#define ACE_HAS_SOCKADDR_MSG_NAME
@@ -15,7 +17,7 @@
#define ACE_LACKS_STRCASECMP
// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
+#define ACE_HAS_SYSV_IPC
#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
@@ -53,7 +55,7 @@
#define ACE_HAS_IP_MULTICAST
// Compiler/platform supports alloca()
-// #define ACE_HAS_ALLOCA
+// #define ACE_HAS_ALLOCA
// Compiler/platform has <alloca.h>
// #define ACE_HAS_ALLOCA_H
@@ -63,7 +65,6 @@
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
// Platform supports the /proc file system.
#define ACE_HAS_PROC_FS
@@ -120,7 +121,7 @@
/* Turn off the following four defines if you want to disable threading. */
// Compile using multi-thread libraries.
#if !defined (ACE_MT_SAFE)
- #define ACE_MT_SAFE 0
+# define ACE_MT_SAFE 0
#endif
// Platform supports threads.
@@ -131,7 +132,7 @@
// #define ACE_HAS_PTHREADS
#define ACE_HAS_SIGWAIT
// If ACE doesn't compile due to the lack of these methods, please
-// send email to schmidt@cs.wustl.edu reporting this.
+// send email to schmidt@cs.wustl.edu reporting this.
// #define ACE_LACKS_CONDATTR_PSHARED
// #define ACE_LACKS_MUTEXATTR_PSHARED
@@ -159,7 +160,7 @@
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
// Defines the page size of the system.
@@ -175,11 +176,11 @@
#define ACE_LACKS_MADVISE
#if !defined (IP_ADD_MEMBERSHIP)
-#define IP_ADD_MEMBERSHIP 0x13
+# define IP_ADD_MEMBERSHIP 0x13
#endif
#if !defined (IP_DROP_MEMBERSHIP)
-#define IP_DROP_MEMBERSHIP 0x14
+# define IP_DROP_MEMBERSHIP 0x14
#endif
// Header files lack t_errno for ACE_TLI.
@@ -188,5 +189,5 @@
// Optimize ACE_Handle_Set for select().
#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
#define ACE_HAS_IDTYPE_T
-#define ACE_DGUX
+
#endif /* ACE_CONFIG_H */
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index 51d424d2ca3..63478b5d786 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -7,6 +7,8 @@
#ifndef ACE_CONFIG_H
#define ACE_CONFIG_H
+#define ACE_DGUX
+
// Static objects do not get initialized correctly, so this is needed.
#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
@@ -63,7 +65,6 @@
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
// Platform supports the /proc file system.
#define ACE_HAS_PROC_FS
@@ -128,7 +129,7 @@
/* Turn off the following four defines if you want to disable threading. */
// Compile using multi-thread libraries.
#if !defined (ACE_MT_SAFE)
-#define ACE_MT_SAFE 1
+# define ACE_MT_SAFE 1
#endif
// Platform supports threads.
@@ -207,7 +208,7 @@
#endif
#if !defined (IP_DROP_MEMBERSHIP)
-#define IP_DROP_MEMBERSHIP 0x14
+# define IP_DROP_MEMBERSHIP 0x14
#endif
// Header files lack t_errno for ACE_TLI.
@@ -216,5 +217,4 @@
// Optimize ACE_Handle_Set for select().
#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_DGUX
#endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix5.2.h b/ace/config-irix5.2.h
index b97fcaae624..6b536810195 100644
--- a/ace/config-irix5.2.h
+++ b/ace/config-irix5.2.h
@@ -10,8 +10,8 @@
// Platform supports STREAM pipes (note that this is disabled by
// default, see the manual page on pipe(2) to find out how to enable
-// it).
-//#define ACE_HAS_STREAM_PIPES
+// it).
+//#define ACE_HAS_STREAM_PIPES
// Platform supports getpagesize() call.
#define ACE_HAS_GETPAGESIZE
@@ -21,7 +21,7 @@
#define ACE_HAS_SIGWAIT
// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
+#define ACE_HAS_SYSV_IPC
// Platform requires void * for mmap().
#define ACE_HAS_VOIDPTR_MMAP
@@ -35,34 +35,33 @@
#define ACE_SIZEOF_LONG_DOUBLE 8
#define IRIX5
-#define ACE_HAS_ALLOCA
+#define ACE_HAS_ALLOCA
// Compiler/platform has <alloca.h>
#define ACE_HAS_ALLOCA_H
#define ACE_HAS_BSTRING
#define ACE_HAS_GETRUSAGE
-#define ACE_HAS_POSIX_NONBLOCK
-#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
-#define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_POLL
-#define ACE_HAS_PROC_FS
-#define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_UCONTEXT_T
-#define ACE_HAS_STREAMS
-#define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
-#define ACE_HAS_STRBUF_T
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-#define ACE_HAS_SVR4_SIGNAL_T
-#define ACE_HAS_SYS_SIGLIST
-#define ACE_HAS_SYS_FILIO_H
-#define ACE_HAS_SEMUN
+#define ACE_HAS_POSIX_NONBLOCK
+#define ACE_HAS_POSIX_TIME
+#define ACE_HAS_CPLUSPLUS_HEADERS
+#define ACE_HAS_POLL
+#define ACE_HAS_PROC_FS
+#define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SIGINFO_T
+#define ACE_HAS_UCONTEXT_T
+#define ACE_HAS_STREAMS
+#define ACE_HAS_SSIZE_T
+#define ACE_HAS_STRERROR
+#define ACE_HAS_STRBUF_T
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+#define ACE_HAS_SVR4_SIGNAL_T
+#define ACE_HAS_SYS_SIGLIST
+#define ACE_HAS_SYS_FILIO_H
+#define ACE_HAS_SEMUN
#define ACE_NEEDS_DEV_IO_CONVERSION
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
#endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index f47390785ed..133b862d2c9 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -54,7 +54,6 @@
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
// Compiler/platform has correctly prototyped header files.
#define ACE_HAS_CPLUSPLUS_HEADERS
@@ -109,7 +108,7 @@
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
#endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h
index a4d0efd74a0..5cbf0ac5782 100644
--- a/ace/config-irix5.3-sgic++.h
+++ b/ace/config-irix5.3-sgic++.h
@@ -2,7 +2,7 @@
// $Id$
// The following configuration file is designed to work
-// for the SGI Indigo2EX running Irix 5.3 platform using
+// for the SGI Indigo2EX running Irix 5.3 platform using
// the SGI C++ Compiler.
#ifndef ACE_CONFIG_H
@@ -26,7 +26,7 @@
#define ACE_HAS_SIGWAIT
// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
+#define ACE_HAS_SYSV_IPC
// Platform requires void * for mmap().
#define ACE_HAS_VOIDPTR_MMAP
@@ -38,7 +38,7 @@
#define ACE_HAS_SYSCALL_H
// Compiler/platform supports alloca()
-#define ACE_HAS_ALLOCA
+#define ACE_HAS_ALLOCA
// Compiler/platform has <alloca.h>
#define ACE_HAS_ALLOCA_H
@@ -50,64 +50,63 @@
#define ACE_HAS_GETRUSAGE
// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
+#define ACE_HAS_POSIX_NONBLOCK
// Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
+#define ACE_HAS_POSIX_TIME
// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS
+#define ACE_HAS_CPLUSPLUS_HEADERS
// Platform contains <poll.h>.
-#define ACE_HAS_POLL
+#define ACE_HAS_POLL
-// No multi-threading so use poll() call
-// - for easier debugging, if nothing else
+// No multi-threading so use poll() call
+// - for easier debugging, if nothing else
// #define ACE_USE_POLL
// Platform supports the /proc file system.
-// #define ACE_HAS_PROC_FS
+// #define ACE_HAS_PROC_FS
// Compiler/platform defines the sig_atomic_t typedef.
-#define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SIG_ATOMIC_T
// Platform supports SVR4 extended signals.
-#define ACE_HAS_SIGINFO_T
-// #define ACE_HAS_UCONTEXT_T
+#define ACE_HAS_SIGINFO_T
+// #define ACE_HAS_UCONTEXT_T
#define ACE_LACKS_UCONTEXT_H
// Compiler supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T
+#define ACE_HAS_SSIZE_T
// Platform supports STREAMS.
-#define ACE_HAS_STREAMS
+#define ACE_HAS_STREAMS
// Platform supports STREAM pipes (note that this is disabled by
// default, see the manual page on pipe(2) to find out how to enable
-// it).
-// #define ACE_HAS_STREAM_PIPES
+// it).
+// #define ACE_HAS_STREAM_PIPES
// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
+#define ACE_HAS_STRERROR
// Compiler/platform supports struct strbuf.
-#define ACE_HAS_STRBUF_T
+#define ACE_HAS_STRBUF_T
// Compiler/platform supports SVR4 dynamic linking semantics.
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
// Compiler/platform supports SVR4 signal typedef.
-#define ACE_HAS_IRIX_53_SIGNALS
+#define ACE_HAS_IRIX_53_SIGNALS
// Compiler/platform supports sys_siglist array.
-// #define ACE_HAS_SYS_SIGLIST
+// #define ACE_HAS_SYS_SIGLIST
// Platform provides <sys/filio.h> header.
-#define ACE_HAS_SYS_FILIO_H
+#define ACE_HAS_SYS_FILIO_H
// Compiler/platform defines a union semun for SysV shared memory.
-#define ACE_HAS_SEMUN
+#define ACE_HAS_SEMUN
// Platform supports IP multicast
#define ACE_HAS_IP_MULTICAST
@@ -116,8 +115,7 @@
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
-
#endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.x-common.h b/ace/config-irix6.x-common.h
index 11f764162d9..c577fb8d2c1 100644
--- a/ace/config-irix6.x-common.h
+++ b/ace/config-irix6.x-common.h
@@ -121,15 +121,9 @@
//**************************************************************
// Not so sure how next lines should look like
-// Platform supports POSIX timers via timestruc_t.
-// This will *NOT* work in 6.4, but ACE doesn't use it anymore.
-// #define ACE_HAS_POSIX_TIME
-// #define ACE_HAS_SVR4_TIME
-
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-// #define ACE_HAS_SVR4_TIME
#define ACE_LACKS_SYSTIME_H
//**************************************************************
@@ -140,8 +134,7 @@
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
-
#endif /* ACE_CONFIG_IRIX6X_COMMON_H */
diff --git a/ace/config-m88k.h b/ace/config-m88k.h
index 22b88e81b76..bdb1a64a02c 100644
--- a/ace/config-m88k.h
+++ b/ace/config-m88k.h
@@ -8,7 +8,7 @@
#define ACE_CONFIG_H
#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
+# define __ACE_INLINE__
#endif /* ! __ACE_INLINE__ */
#if defined (__GNUG__)
@@ -51,17 +51,17 @@ struct ip_mreq
};
#if !defined (ACE_HAS_FSU_PTHREADS)
-#define ACE_HAS_FSU_PTHREADS
+# define ACE_HAS_FSU_PTHREADS
#endif
#if !defined (ACE_HAS_PTHREADS_DRAFT6)
-#define ACE_HAS_PTHREADS_DRAFT6
+# define ACE_HAS_PTHREADS_DRAFT6
#endif
// Added for compilation on the m88k
#if defined (m88k)
-#define ACE_LACKS_T_ERRNO
-#define ACE_LACKS_MADVISE
-#define ACE_HAS_GNU_CSTRING_H
+# define ACE_LACKS_T_ERRNO
+# define ACE_LACKS_MADVISE
+# define ACE_HAS_GNU_CSTRING_H
#endif /* m88k */
// Platform supports System V IPC (most versions of UNIX, but not Win32)
@@ -104,7 +104,7 @@ struct ip_mreq
#if !defined (m88k)
// Compiler/platform supports SunOS high resolution timers.
-#define ACE_HAS_HI_RES_TIMER
+# define ACE_HAS_HI_RES_TIMER
#endif /* m88k */
// Platform supports IP multicast
@@ -123,7 +123,6 @@ struct ip_mreq
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
// Platform supports the /proc file system.
#define ACE_HAS_PROC_FS
@@ -217,7 +216,7 @@ struct ip_mreq
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
// Defines the page size of the system.
diff --git a/ace/config-osf1-3.2.h b/ace/config-osf1-3.2.h
index a7fcfc04d9f..dca7b92dbc9 100644
--- a/ace/config-osf1-3.2.h
+++ b/ace/config-osf1-3.2.h
@@ -24,8 +24,8 @@
#define ACE_HAS_STRING_CLASS
// DF: Seems apropriate since this is a new compiler...
-#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
+#if !defined (__ACE_INLINE__)
+# define __ACE_INLINE__
#endif /* ! __ACE_INLINE__ */
#define ACE_HAS_BROKEN_MSG_H
@@ -107,7 +107,6 @@
// Platform defines struct timespec in <sys/timers.h>
#define ACE_HAS_BROKEN_POSIX_TIME
-// #define ACE_HAS_SVR4_TIME
// Platform supports POSIX O_NONBLOCK semantics.
#define ACE_HAS_POSIX_NONBLOCK
@@ -171,14 +170,14 @@
// Compile using multi-thread libraries.
#if !defined (ACE_MT_SAFE)
- #define ACE_MT_SAFE 1
+# define ACE_MT_SAFE 1
#endif
#define ACE_NEEDS_DEV_IO_CONVERSION
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
// Defines the page size of the system.
diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h
index 0abf2e31ce5..3144a415f6f 100644
--- a/ace/config-sunos5.4-centerline-2.x.h
+++ b/ace/config-sunos5.4-centerline-2.x.h
@@ -61,7 +61,6 @@
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
// Platform supports the /proc file system.
#define ACE_HAS_PROC_FS
@@ -154,16 +153,17 @@
// 10 millisecond fudge factor to account for Solaris timers...
#if !defined (ACE_TIMER_SKEW)
-#define ACE_TIMER_SKEW 1000 * 10
+# define ACE_TIMER_SKEW 1000 * 10
#endif /* ACE_TIMER_SKEW */
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
// Defines the page size of the system.
#define ACE_PAGE_SIZE 4096
#define ACE_HAS_IDTYPE_T
#define ACE_HAS_DIRENT
+
#endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h
index ed07a93c801..7e4ae386e61 100644
--- a/ace/config-sunos5.4-g++.h
+++ b/ace/config-sunos5.4-g++.h
@@ -8,7 +8,7 @@
#define ACE_CONFIG_H
#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
+# define __ACE_INLINE__
#endif /* ! __ACE_INLINE__ */
#include "ace/config-g++-common.h"
@@ -73,7 +73,6 @@
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
// Platform supports the /proc file system.
#define ACE_HAS_PROC_FS
@@ -127,10 +126,10 @@
/* Turn off the following defines if you want to disable threading. */
// Compile using multi-thread libraries.
#if !defined (ACE_MT_SAFE)
-#define ACE_MT_SAFE 1
-#if !defined (_REENTRANT)
-#define _REENTRANT
-#endif /* _REENTRANT */
+# define ACE_MT_SAFE 1
+# if !defined (_REENTRANT)
+# define _REENTRANT
+# endif /* _REENTRANT */
#endif /* !ACE_MT_SAFE */
// Platform supports Solaris threads.
@@ -167,12 +166,12 @@
// 10 millisecond fudge factor to account for Solaris timers...
#if !defined (ACE_TIMER_SKEW)
-#define ACE_TIMER_SKEW 1000 * 10
+# define ACE_TIMER_SKEW 1000 * 10
#endif /* ACE_TIMER_SKEW */
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
// Defines the page size of the system.
@@ -180,4 +179,5 @@
#define ACE_HAS_IDTYPE_T
#define ACE_HAS_GPERF
#define ACE_HAS_DIRENT
+
#endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h
index 67a3b5c4fa0..88cfc6279b2 100644
--- a/ace/config-sunos5.4-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.4-sunc++-4.x-orbix.h
@@ -9,7 +9,7 @@
#define ACE_CONFIG_H
#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
+# define __ACE_INLINE__
#endif /* ! __ACE_INLINE__ */
#define ACE_HAS_TEMPLATE_SPECIALIZATION
@@ -77,7 +77,6 @@
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
// Platform supports the /proc file system.
#define ACE_HAS_PROC_FS
@@ -176,12 +175,12 @@
// 10 millisecond fudge factor to account for Solaris timers...
#if !defined (ACE_TIMER_SKEW)
-#define ACE_TIMER_SKEW 1000 * 10
+# define ACE_TIMER_SKEW 1000 * 10
#endif /* ACE_TIMER_SKEW */
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
// Defines the page size of the system.
diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h
index a3e715b6fe8..3bcf2b05330 100644
--- a/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ace/config-sunos5.4-sunc++-4.x.h
@@ -8,7 +8,7 @@
#define ACE_CONFIG_H
#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
+# define __ACE_INLINE__
#endif /* ! __ACE_INLINE__ */
#define ACE_HAS_TEMPLATE_SPECIALIZATION
@@ -71,7 +71,6 @@
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
// Platform supports the /proc file system.
#define ACE_HAS_PROC_FS
@@ -173,13 +172,13 @@
// 10 millisecond fudge factor to account for Solaris timers...
#if !defined (ACE_TIMER_SKEW)
-#define ACE_TIMER_SKEW 1000 * 10
+# define ACE_TIMER_SKEW 1000 * 10
#endif /* ACE_TIMER_SKEW */
// Turns off the tracing feature.
// #define ACE_NTRACE 0
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
// Defines the page size of the system.
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index a65510a5c8a..8a1c0fc53ae 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -124,7 +124,6 @@
// Platform supports POSIX timers via timestruc_t.
#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
// ACE_HAS_CLOCK_GETTIME requires linking with -lposix4.
#define ACE_HAS_CLOCK_GETTIME
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index a7fe50c76ff..6b797eb4062 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -19,7 +19,7 @@
#define ACE_CONFIG_H
#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
+# define __ACE_INLINE__
#endif /* ! __ACE_INLINE__ */
#define ACE_HAS_IDTYPE_T
@@ -85,7 +85,6 @@
// Platform supports the POSIX struct timespec type
#define ACE_HAS_POSIX_TIME // As i understand it, but i'm in deep water
//Platform supports the SVR4 timestruc_t type
-#define ACE_HAS_SVR4_TIME
//ACE_HAS_PROC_FS Platform supports the /proc file system
@@ -447,12 +446,10 @@
//ACE_USE_POLL Use the poll() event demultiplexor
//rather than select().
-
-
// Turns off the tracing feature.
// #define ACE_NTRACE 0
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
// Defines the page size of the system.
diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h
index 3ca397b6fcf..d9e6ec1d64f 100644
--- a/ace/config-unixware-2.01-g++.h
+++ b/ace/config-unixware-2.01-g++.h
@@ -9,7 +9,7 @@
// See README for what the ACE_HAS... and ACE_LACKS... macros mean
#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
+# define __ACE_INLINE__
#endif /* ! __ACE_INLINE__ */
#if defined (__GNUG__)
@@ -51,7 +51,6 @@
#define ACE_HAS_STREAM_PIPES
#define ACE_HAS_STRERROR
#define ACE_HAS_SVR4_DYNAMIC_LINKING
-#define ACE_HAS_SVR4_TIME
#define ACE_HAS_SYSCALL_H
#define ACE_HAS_SYSINFO
#define ACE_HAS_SYSV_IPC
@@ -74,13 +73,14 @@
#if !defined (ACE_MT_SAFE)
# define ACE_MT_SAFE 1
#endif
+
#define ACE_PAGE_SIZE 4096
#define ACE_REDEFINES_XTI_FUNCTIONS
// Compiling for UNIXWARE
#if !defined (UNIXWARE)
-#define UNIXWARE
-#define UNIXARE_2_0
+# define UNIXWARE
+# define UNIXARE_2_0
#endif /* UNIXWARE */
// These seem to be missing... Process_Manager uses them
@@ -102,7 +102,7 @@
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
#endif /* ACE_CONFIG_H */
diff --git a/ace/config-unixware-2.1.2-g++.h b/ace/config-unixware-2.1.2-g++.h
index a1c774118a7..12f8799e816 100644
--- a/ace/config-unixware-2.1.2-g++.h
+++ b/ace/config-unixware-2.1.2-g++.h
@@ -10,7 +10,7 @@
// See README for what the ACE_HAS... and ACE_LACKS... macros mean
#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
+# define __ACE_INLINE__
#endif /* ! __ACE_INLINE__ */
#if defined (__GNUG__)
@@ -53,7 +53,6 @@
#define ACE_HAS_STREAM_PIPES
#define ACE_HAS_STRERROR
#define ACE_HAS_SVR4_DYNAMIC_LINKING
-#define ACE_HAS_SVR4_TIME
#define ACE_HAS_SYSCALL_H
#define ACE_HAS_SYSINFO
#define ACE_HAS_SYSV_IPC
@@ -79,17 +78,20 @@
#if !defined (ACE_MT_SAFE)
# define ACE_MT_SAFE 1
#endif
+
#define ACE_PAGE_SIZE 4096
#define ACE_REDEFINES_XTI_FUNCTIONS
-#if ! defined (UNIXWARE)
-#define UNIXWARE
-#define UNIXWARE_2_1
+#if !defined (UNIXWARE)
+# define UNIXWARE
+# define UNIXWARE_2_1
#endif /* ! UNIXWARE */
// Turns off the tracing feature.
#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
+# define ACE_NTRACE 1
#endif /* ACE_NTRACE */
+
#define ACE_HAS_IDTYPE_T
+
#endif /* ACE_CONFIG_H */