diff options
| author | zhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-03-12 21:49:10 +0000 |
|---|---|---|
| committer | zhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-03-12 21:49:10 +0000 |
| commit | a74b6ebaa7aca9c1ec9428122679dc48aa970bf6 (patch) | |
| tree | c2063d9ebab5dbcb94d9d37b642197766d1c5ff1 | |
| parent | ba5b5451875d159879d79b993808d6889ced81ef (diff) | |
| download | ATCD-a74b6ebaa7aca9c1ec9428122679dc48aa970bf6.tar.gz | |
Mon Mar 12 21:47:51 UTC 2007 Wallace Zhang <zhang_w@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdio.inl | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 02f3a3826a9..e2744001793 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Mar 12 21:47:51 UTC 2007 Wallace Zhang <zhang_w@ociweb.com> + + * ace/OS_NS_stdio.inl: + + Fixed compilation errors on WinCE 5.0 builds. + Mon Mar 12 22:26:08 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> * ace/checked_iterator.h (ACE_make_checked_array_iterator): @@ -11,7 +17,7 @@ Mon Mar 12 22:26:08 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> Call new ACE_make_checked_array_iterator<>() iterator factory function to generate destination iterator. Addresses VC8 "C4996" warnings when security related warnings are enabled. - + * ace/Makefile.am: * ace/ace.mpc: * ace/ace_for_tao.mpc: diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index ccb49e77da5..637af5bb7c6 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -996,7 +996,7 @@ 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_VSWPRINTF) || defined (ACE_WIN32_VC8) + defined (ACE_HAS_VSWPRINTF) || defined (ACE_WIN32_VC8) && !defined (ACE_HAS_WINCE) // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a // maxlen argument. Since this method doesn't supply one, pass in |