Fri Jan 5 12:44:18 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 25 insertions, 1 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 90a04aa5f66..c0d3a4a9987 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,19 @@
+Fri Jan  5 12:44:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_stdio.cpp:
+          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:
+        * ace/config-vxworks6.4.h:
+          Added ACE_HAS_VFWPRINTF
+
+        * ace/config-win32-common.h:
+          Removed ACE_HAS_VSWPRINTF, isn't used anymore
+
 Fri Jan  5 11:09:18 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-hpux-11.00.h:
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index c4b23cb1904..0c744c474f5 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -12,6 +12,10 @@ 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 a52f56f7aed..af865d1970a 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -395,6 +395,7 @@
 
 #define ACE_LACKS_SUSECONDS_T
 #define ACE_LACKS_SYS_SYSCTL_H
+#define ACE_HAS_VFWPRINTF
 
 // Shared library name/path components
 #if defined (__ia64)
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index dbe9e5b12c5..1a7c31a2246 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -237,6 +237,7 @@
 #if __GLIBC__ >= 2
 // glibc 2 and higher has wchar support
 # define ACE_HAS_XPG4_MULTIBYTE_CHAR
+# define ACE_HAS_VFWPRINTF
 #endif
 
 #if __GLIBC__ < 2
diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h
index 8ce5073d28c..36069489479 100644
--- a/ACE/ace/config-vxworks6.2.h
+++ b/ACE/ace/config-vxworks6.2.h
@@ -210,6 +210,7 @@
   #define ACE_HAS_SETENV
   #define ACE_HAS_3_PARAM_WCSTOK
   #define ACE_HAS_WCHAR
+  #define ACE_HAS_VFWPRINTF
   #define ACE_SIZEOF_WCHAR 2
 #else
   // We are building for kernel mode
diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h
index 44aef87c779..25a36d9bc44 100644
--- a/ACE/ace/config-vxworks6.3.h
+++ b/ACE/ace/config-vxworks6.3.h
@@ -169,6 +169,7 @@
   #define ACE_HAS_SETENV
   #define ACE_HAS_3_PARAM_WCSTOK
   #define ACE_HAS_WCHAR
+  #define ACE_HAS_VFWPRINTF
   #define ACE_SIZEOF_WCHAR 2
   #define ACE_HAS_SHM_OPEN
   #define ACE_HAS_AIO_CALLS
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index d9a54a2d240..fbc957b9b85 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -177,6 +177,7 @@
   #define ACE_HAS_SETENV
   #define ACE_HAS_3_PARAM_WCSTOK
   #define ACE_HAS_WCHAR
+  #define ACE_HAS_VFWPRINTF
   #define ACE_SIZEOF_WCHAR 2
   #define ACE_HAS_SHM_OPEN
   #define ACE_HAS_AIO_CALLS
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 01eea5f3dbe..c0fd492ef28 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -288,7 +288,6 @@
 #define ACE_LACKS_IOVEC
 
 #define ACE_HAS_VFWPRINTF
-#define ACE_HAS_VSWPRINTF
 
 #define ACE_MKDIR_LACKS_MODE