summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog16
-rw-r--r--ChangeLogs/ChangeLog-02a16
-rw-r--r--ChangeLogs/ChangeLog-03a16
-rw-r--r--ace/config-aix-4.1.x.h7
-rw-r--r--ace/config-aix-4.2.x.h7
-rw-r--r--ace/config-aix-4.3.x.h7
-rw-r--r--ace/config-aix-4.x.h44
-rw-r--r--ace/config-aix5.1.h5
-rw-r--r--include/makeinclude/platform_aix_ibm.GNU3
9 files changed, 83 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index eba7d7c530b..6977deb0e30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Wed Sep 05 11:52:39 2001 Steve Huston <shuston@riverace.com>
+
+ * ace/config-aix5.1.h: New config file for AIX 5L, version 5.1,
+ using Visual Age C++ 5.
+
+ * ace/config-aix-4.1.x.h:
+ * ace/config-aix-4.2.x.h:
+ * ace/config-aix-4.3.x.h:
+ * ace/config-aix-4.x.h: Use ACE_AIX_VERS (which has both major and
+ minor version) rather than ACE_AIX_MAJOR_VERS and ACE_AIX_MINOR_VERS.
+
+ * include/makeinclude/platform_aix_ibm.GNU: Rather than making
+ separate major/minor OS version variables, use one that incorporates
+ both to make it easier for config.h files to set upwardly-compatible
+ feature flags.
+
Wed Sep 5 06:55:44 2001 Chad Elliott <elliott_c@ociweb.com>
* tests/Log_Msg_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index eba7d7c530b..6977deb0e30 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Wed Sep 05 11:52:39 2001 Steve Huston <shuston@riverace.com>
+
+ * ace/config-aix5.1.h: New config file for AIX 5L, version 5.1,
+ using Visual Age C++ 5.
+
+ * ace/config-aix-4.1.x.h:
+ * ace/config-aix-4.2.x.h:
+ * ace/config-aix-4.3.x.h:
+ * ace/config-aix-4.x.h: Use ACE_AIX_VERS (which has both major and
+ minor version) rather than ACE_AIX_MAJOR_VERS and ACE_AIX_MINOR_VERS.
+
+ * include/makeinclude/platform_aix_ibm.GNU: Rather than making
+ separate major/minor OS version variables, use one that incorporates
+ both to make it easier for config.h files to set upwardly-compatible
+ feature flags.
+
Wed Sep 5 06:55:44 2001 Chad Elliott <elliott_c@ociweb.com>
* tests/Log_Msg_Test.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index eba7d7c530b..6977deb0e30 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,19 @@
+Wed Sep 05 11:52:39 2001 Steve Huston <shuston@riverace.com>
+
+ * ace/config-aix5.1.h: New config file for AIX 5L, version 5.1,
+ using Visual Age C++ 5.
+
+ * ace/config-aix-4.1.x.h:
+ * ace/config-aix-4.2.x.h:
+ * ace/config-aix-4.3.x.h:
+ * ace/config-aix-4.x.h: Use ACE_AIX_VERS (which has both major and
+ minor version) rather than ACE_AIX_MAJOR_VERS and ACE_AIX_MINOR_VERS.
+
+ * include/makeinclude/platform_aix_ibm.GNU: Rather than making
+ separate major/minor OS version variables, use one that incorporates
+ both to make it easier for config.h files to set upwardly-compatible
+ feature flags.
+
Wed Sep 5 06:55:44 2001 Chad Elliott <elliott_c@ociweb.com>
* tests/Log_Msg_Test.cpp:
diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h
index 9c2baafd739..a739c1ae49a 100644
--- a/ace/config-aix-4.1.x.h
+++ b/ace/config-aix-4.1.x.h
@@ -1,11 +1,8 @@
/* -*- C++ -*- */
// $Id$
-#ifndef ACE_AIX_MAJOR_VERS
-# define ACE_AIX_MAJOR_VERS 4
-#endif
-#if !defined (ACE_AIX_MINOR_VERS)
-# define ACE_AIX_MINOR_VERS 1
+#ifndef ACE_AIX_VERS
+# define ACE_AIX_VERS 401
#endif
#include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h
index dbf51bbb06c..b44c851a437 100644
--- a/ace/config-aix-4.2.x.h
+++ b/ace/config-aix-4.2.x.h
@@ -1,11 +1,8 @@
/* -*- C++ -*- */
// $Id$
-#ifndef ACE_AIX_MAJOR_VERS
-# define ACE_AIX_MAJOR_VERS 4
-#endif
-#if !defined (ACE_AIX_MINOR_VERS)
-# define ACE_AIX_MINOR_VERS 2
+#ifndef ACE_AIX_VERS
+# define ACE_AIX_VERS 402
#endif
#include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.3.x.h b/ace/config-aix-4.3.x.h
index 55b3818809a..d6b2824ec35 100644
--- a/ace/config-aix-4.3.x.h
+++ b/ace/config-aix-4.3.x.h
@@ -1,11 +1,8 @@
/* -*- C++ -*- */
// $Id$
-#ifndef ACE_AIX_MAJOR_VERS
-# define ACE_AIX_MAJOR_VERS 4
-#endif
-#if !defined (ACE_AIX_MINOR_VERS)
-# define ACE_AIX_MINOR_VERS 3
+#ifndef ACE_AIX_VERS
+# define ACE_AIX_VERS 403
#endif
#include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 29817fbe354..a649923ac05 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -87,15 +87,15 @@
// Use BSD 4.4 socket definitions for pre-AIX 4.2. The _BSD setting also
// controls the data type used for waitpid(), wait(), and wait3().
-#if (ACE_AIX_MINOR_VERS < 2)
+#if (ACE_AIX_VERS < 402)
# define _BSD 44
# define ACE_HAS_UNION_WAIT
-#endif /* ACE_AIX_MINOR_VERS < 3 */
+#endif /* ACE_AIX_VERS < 402 */
// This environment requires this thing, pre-AIX 4.3
-#if (ACE_AIX_MINOR_VERS < 3)
+#if (ACE_AIX_VERS < 403)
# define _BSD_INCLUDES
-#endif /* ACE_AIX_MINOR_VERS < 3 */
+#endif /* ACE_AIX_VERS < 403 */
#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
@@ -104,25 +104,25 @@
// ACE_HAS_AIX_BROKEN_SOCKET_HEADER may be required if your OS patches are
// not up to date. On up-to-date 4.2+ systems, it should not be required.
// 4.2+ has 4.4 BSD sendmsg/recvmsg
-#if (ACE_AIX_MINOR_VERS < 2)
+#if (ACE_AIX_VERS < 402)
# define ACE_HAS_AIX_BROKEN_SOCKET_HEADER
#else
-# if (ACE_AIX_MINOR_VERS == 2)
+# if (ACE_AIX_VERS == 402)
# define ACE_HAS_SIZET_SOCKET_LEN
# else
# define ACE_HAS_SOCKLEN_T
# endif
# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#endif /* ACE_AIX_MINOR_VERS < 2 */
+#endif /* ACE_AIX_VERS < 402 */
#define ACE_HAS_AIX_HI_RES_TIMER
#define ACE_HAS_ALLOCA
// Compiler/platform has correctly prototyped header files.
#define ACE_HAS_CPLUSPLUS_HEADERS
-#if (ACE_AIX_MINOR_VERS < 3)
+#if (ACE_AIX_VERS < 403)
# define ACE_HAS_CHARPTR_DL
-#endif /* ACE_AIX_MINOR_VERS < 3 */
+#endif /* ACE_AIX_VERS < 403 */
// Prototypes for both signal() and struct sigaction are consistent.
#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
@@ -141,7 +141,7 @@
#define ACE_HAS_NONCONST_SELECT_TIMEVAL
#define ACE_HAS_IP_MULTICAST
#define ACE_HAS_MSG
-#if (ACE_AIX_MINOR_VERS < 2)
+#if (ACE_AIX_VERS < 402)
# define ACE_LACKS_MSG_ACCRIGHTS
# define ACE_LACKS_RLIMIT
#endif
@@ -154,9 +154,9 @@
#define ACE_HAS_POSIX_TIME
// ... but needs to include another header for it on 4.2+
-#if (ACE_AIX_MINOR_VERS >= 2)
+#if (ACE_AIX_VERS >= 402)
# define ACE_HAS_BROKEN_POSIX_TIME
-#endif /* ACE_AIX_MINOR_VERS > 2 */
+#endif /* ACE_AIX_VERS > 402 */
// ... and needs another typedef
#define ACE_LACKS_TIMESPEC_T
#define ACE_HAS_SELECT_H
@@ -165,21 +165,21 @@
// Compiler/platform defines the sig_atomic_t typedef
#define ACE_HAS_SIG_ATOMIC_T
-#if (ACE_AIX_MINOR_VERS >= 2)
+#if (ACE_AIX_VERS >= 402)
# define ACE_HAS_SIGINFO_T
# define ACE_LACKS_SIGINFO_H
-#endif /* ACE_AIX_MINOR_VERS >=2 */
-#if (ACE_AIX_MINOR_VERS >= 3)
+#endif /* ACE_AIX_VERS >= 402 */
+#if (ACE_AIX_VERS >= 403)
# define ACE_HAS_SIGTIMEDWAIT
// it may exist in earlier revs, but I'm not sure and I don't have a
// system to validate
# define ACE_HAS_P_READ_WRITE
-#endif /* ACE_AIX_MINOR_VERS >= 3 */
+#endif /* ACE_AIX_VERS >= 403 */
#define ACE_HAS_SIGWAIT
-#if (ACE_AIX_MINOR_VERS >= 3)
+#if (ACE_AIX_VERS >= 403)
# define ACE_HAS_SIGTIMEDWAIT
-#endif /* ACE_AIX_MINOR_VERS >= 3 */
+#endif /* ACE_AIX_VERS >= 403 */
#define ACE_HAS_SIN_LEN
#define ACE_HAS_STRBUF_T
@@ -214,9 +214,9 @@
#define ACE_HAS_UALARM
-#if (ACE_AIX_MINOR_VERS >= 2)
+#if (ACE_AIX_VERS >= 402)
# define ACE_HAS_UCONTEXT_T
-#endif /* ACE_AIX_MINOR_VERS >= 2 */
+#endif /* ACE_AIX_VERS >= 402 */
#define ACE_HAS_UTIME
@@ -256,7 +256,7 @@
# define ACE_HAS_PTHREADS
// 4.3 and up has 1003.1c standard; 4.2 has draft 7
-# if (ACE_AIX_MINOR_VERS >= 3)
+# if (ACE_AIX_VERS >= 403)
# define ACE_HAS_PTHREADS_STD
# define ACE_HAS_PTHREADS_UNIX98_EXT
# else
@@ -268,7 +268,7 @@
// #define ACE_LACKS_CONDATTR_PSHARED
// #define ACE_LACKS_MUTEXATTR_PSHARED
# define ACE_LACKS_SETSCHED
-# endif /* ACE_AIX_MINOR_VERS >= 3 */
+# endif /* ACE_AIX_VERS >= 403 */
# define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
# define ACE_HAS_SIGTHREADMASK
diff --git a/ace/config-aix5.1.h b/ace/config-aix5.1.h
new file mode 100644
index 00000000000..3d1d53828cd
--- /dev/null
+++ b/ace/config-aix5.1.h
@@ -0,0 +1,5 @@
+// $Id$
+//
+// Config file for AIX 5.1
+
+#include "ace/config-aix-4.x.h"
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
index 95b85def16a..6fd5fc49a7e 100644
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ b/include/makeinclude/platform_aix_ibm.GNU
@@ -44,6 +44,7 @@ ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
# grab it here and pass it all to the compiler as well.
AIX_MAJOR_VERS := $(shell uname -v)
AIX_MINOR_VERS := $(shell uname -r)
+AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS)
# Use of exceptions should be a compiler-specific setting, but for now it's
# not. IBM C/C++ doesn't have a way to turn exceptions off, and Visual
@@ -81,7 +82,7 @@ LD = $(ACE_ROOT)/bin/aix_shr $(CXX)
RANLIB = ranlib
TEMPINCDIR = tempinc
-CPPFLAGS += -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
+CPPFLAGS += -DACE_AIX_VERS=$(AIX_VERS)
# -qinitauto seems like an interesting option, but some tests (specifically
# Process_Strategy_Test) hang with it turned on. This should be investigated
# at some point.
View Lorry Controller Status