diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-01 08:52:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-01 08:52:54 +0000 |
| commit | 896211cafc5407c3c1c8098b9fc811776996b0af (patch) | |
| tree | 3a8da4816119df5c0b3391b3d23ef4636703132a | |
| parent | ea9836ef268c4aaa11e0e0275c307914ee68e1ea (diff) | |
| download | ATCD-896211cafc5407c3c1c8098b9fc811776996b0af.tar.gz | |
Thu Mar 1 08:51:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdio.cpp | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdio.inl | 8 | ||||
| -rw-r--r-- | ACE/ace/config-hpux-11.00.h | 1 |
4 files changed, 18 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index ab74bd3e3fe..432111880ec 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Thu Mar 1 08:51:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_stdio.{cpp,inl}: + Introduced new ACE_HAS_VSWPRINTF that we can set when a platform + has this method + + * ace/config-hpux-11.00.h: + Added ACE_HAS_VSWPRINTF + Wed Feb 28 21:34:45 UTC 2007 Wallace Zhang <zhang_w@ociweb.com> * bin/tao_orb_tests.lst: diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index c4b23cb1904..cc84ed14df7 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -328,7 +328,7 @@ ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) // ACE_OS_TRACE ("ACE_OS::snprintf"); # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ (defined (sun) && !defined (_XPG4) || defined(_XPG5)) || \ - defined (ACE_WIN32) + defined (ACE_WIN32) || defined (ACE_HAS_VSWPRINTF) int result; va_list ap; va_start (ap, format); @@ -387,7 +387,8 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...) # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ (defined (sun) && !defined (_XPG4) || defined(_XPG5)) || \ - (defined ACE_HAS_DINKUM_STL) || defined (__DMC__) + (defined ACE_HAS_DINKUM_STL) || defined (__DMC__) || \ + defined ACE_HAS_VSWPRINTF // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a // maxlen argument. Since this method doesn't supply one, pass in diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 466800aa600..8c36b8397d5 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -447,7 +447,7 @@ ACE_OS::cuserid (char *user, size_t maxlen) // Make sure the password file is closed. ::endpwent (); - + if (pw == 0) { errno = ENOENT; @@ -982,7 +982,8 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) { # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ - (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__)) + (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__)) || \ + defined (ACE_HAS_VSWPRINTF) // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a // maxlen argument. Since this method doesn't supply one, pass in @@ -1013,7 +1014,8 @@ ACE_OS::vsnprintf (wchar_t *buffer, size_t maxlen, const wchar_t *format, va_lis { # if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ - (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__)) + (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__)) || \ + defined (ACE_HAS_VSWPRINTF) return vswprintf (buffer, maxlen, format, ap); diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index c4801cfa514..1ee62c47168 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -382,6 +382,7 @@ #define ACE_LACKS_SUSECONDS_T #define ACE_LACKS_SYS_SYSCTL_H +#define ACE_HAS_VSWPRINTF // Shared library name/path components #if defined (__ia64) |