summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2003-12-16 17:49:48 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2003-12-16 17:49:48 +0000
commitabb4002dba6a4364a859dfaf6b05923fc2dd4513 (patch)
treee6809168a9dfab93192018ab487a0bd2ad8cd148
parenta88e4355bf88a2ede2263478e18ef529b7378411 (diff)
downloadATCD-abb4002dba6a4364a859dfaf6b05923fc2dd4513.tar.gz
ChangeLogTag: Tue Dec 16 11:48:11 2003 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog26
-rw-r--r--ace/config-aix-4.x.h3
-rw-r--r--ace/config-aix5.1.h3
3 files changed, 22 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 80097c91993..53d89fda190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,22 @@
+Tue Dec 16 11:48:11 2003 Chad Elliott <elliott_c@ociweb.com>
+
+ * ace/config-aix-4.x.h:
+ * ace/config-aix5.1.h:
+
+ Updated the AIX config files to reflect the existence of
+ netinet/tcp.h on AIX 5.1.
+
Tue Dec 16 09:31:18 2003 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
- * ace/Thread_Semaphore.{h,cpp}:
- * ace/Process_Semaphore.{h,cpp}: Reverted the change
- Sun Dec 14 15:26:46 2003 Douglas C. Schmidt
- <schmidt@ace.cs.wustl.edu> since this has too many side-effects
- that'll break user code. The "Right Thing"[TM] here is simply
- to update the ACE_Malloc<> documentation to explain not to use
- the ACE_Process_Semaphore or ACE_Thread_Semaphore, but instead
- to use the ACE_Process_Mutex or ACE_Thread_Mutex. Thanks to
- Don Hinton and Bala for motivating this change.
+ * ace/Thread_Semaphore.{h,cpp}:
+ * ace/Process_Semaphore.{h,cpp}: Reverted the change
+ Sun Dec 14 15:26:46 2003 Douglas C. Schmidt
+ <schmidt@ace.cs.wustl.edu> since this has too many side-effects
+ that'll break user code. The "Right Thing"[TM] here is simply
+ to update the ACE_Malloc<> documentation to explain not to use
+ the ACE_Process_Semaphore or ACE_Thread_Semaphore, but instead
+ to use the ACE_Process_Mutex or ACE_Thread_Mutex. Thanks to
+ Don Hinton and Bala for motivating this change.
Tue Dec 16 08:29:05 2003 Chad Elliott <elliott_c@ociweb.com>
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index d98bcd833fb..8a14bb32b51 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -64,6 +64,7 @@
# endif /* ACE_HAS_USING_KEYWORD */
# define ACE_HAS_STANDARD_CPP_LIBRARY 1
# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
+# define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
# endif /* __IBMCPP__ >= 500 */
# endif /* __IBMCPP__ */
@@ -252,7 +253,7 @@
// Platform has XPG4 wide character type and functions
#define ACE_HAS_XPG4_MULTIBYTE_CHAR
-#define ACE_LACKS_TCP_H
+#define ACE_LACKS_NETINET_TCP_H
// AIX uses LIBPATH to search for libraries
#define ACE_LD_SEARCH_PATH "LIBPATH"
diff --git a/ace/config-aix5.1.h b/ace/config-aix5.1.h
index 8103f64d902..5f82448bc1c 100644
--- a/ace/config-aix5.1.h
+++ b/ace/config-aix5.1.h
@@ -19,3 +19,6 @@
// I think this is correct, but needs to be verified... -Steve Huston
#define ACE_HAS_SIGTIMEDWAIT
+
+// AIX 5.1 has netinet/tcp.h
+#undef ACE_LACKS_NETINET_TCP_H