summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-01-05 13:35:00 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-01-05 13:35:00 +0000
commita9de2b4f6403a8978f08a729d998f13a0d5666dd (patch)
tree3146c1df151d74a038b2a8a6723663a61018180c
parentfa86a332804dcc80c64e5c3e86669c5d01cec995 (diff)
downloadATCD-a9de2b4f6403a8978f08a729d998f13a0d5666dd.tar.gz
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/ace/OS_NS_stdio.cpp4
-rw-r--r--ACE/ace/config-hpux-11.00.h1
3 files changed, 7 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e2fa82c2461..907b3056fb2 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jan 5 13:34:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/OS_NS_stdio.cpp:
+ * ace/config-hpux-11.00.h:
+ Disable ACE_HAS_VFWPRINTF again for HPUX, takes more time,
+ something for the future
+
Fri Jan 5 13:15:16 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>
* ace/INET_Addr.cpp:
@@ -16,7 +23,6 @@ Fri Jan 5 12:44:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
When ACE_HAS_WCHAR is defined include os_wchar.h to get the
wchar methods which is needed on for example HPUX
- * ace/config-hpux-11.00.h:
* ace/config-linux-common.h:
* ace/config-vxworks6.2.h:
* ace/config-vxworks6.3.h:
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index 0c744c474f5..c4b23cb1904 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -12,10 +12,6 @@ ACE_RCSID (ace,
# include "ace/OS_NS_stdio.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
-#if defined (ACE_HAS_WCHAR)
-#include "ace/os_include/os_wchar.h"
-#endif
-
# if defined (ACE_WIN32)
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index af865d1970a..a52f56f7aed 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -395,7 +395,6 @@
#define ACE_LACKS_SUSECONDS_T
#define ACE_LACKS_SYS_SYSCTL_H
-#define ACE_HAS_VFWPRINTF
// Shared library name/path components
#if defined (__ia64)