diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-10 18:18:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-10 18:18:30 +0000 |
| commit | c86fd4f9710615419f19e7daf6fa1b640a56d700 (patch) | |
| tree | 93b9d7e4773e802a3e4a7806813fe3733f629dc4 | |
| parent | 345b501ddc3a64a43132ff607dd9c1d2a3dc5103 (diff) | |
| download | ATCD-c86fd4f9710615419f19e7daf6fa1b640a56d700.tar.gz | |
Wed Jun 10 18:18:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-win32-msvc-9.h:
* ace/OS_NS_stdio.inl:
Fix for Windows CE with msvc9
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdio.inl | 3 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-9.h | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 11f29dee0a6..8d666a5ff78 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 10 18:18:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-msvc-9.h: + * ace/OS_NS_stdio.inl: + Fix for Windows CE with msvc9 + Wed Jun 10 14:07:09 UTC 2009 Adam Mitz <mitza@ociweb.com> * include/makeinclude/platform_vxworks6.3.GNU: diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 8d34f35dab1..51318281098 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -1009,7 +1009,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_VSWPRINTF) || defined (ACE_WIN32_VC9) || \ + defined (ACE_HAS_VSWPRINTF) || \ + (defined (ACE_WIN32_VC9) && !defined (ACE_HAS_WINCE)) || \ (defined (ACE_WIN32_VC8) && !defined (ACE_HAS_WINCE) && \ _MSC_FULL_VER > 140050000) diff --git a/ACE/ace/config-win32-msvc-9.h b/ACE/ace/config-win32-msvc-9.h index 2faa35edde7..aa101ab63ad 100644 --- a/ACE/ace/config-win32-msvc-9.h +++ b/ACE/ace/config-win32-msvc-9.h @@ -65,10 +65,10 @@ #define ACE_LACKS_STRPTIME // Evaluate this with a WinCE build; maybe things have improved since VC8. -//#if !defined (ACE_HAS_WINCE) +#if !defined (ACE_HAS_WINCE) # define ACE_HAS_INTRIN_H # define ACE_HAS_INTRINSIC_INTERLOCKED -//#endif +#endif #if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) # define ACE_HAS_INTRINSIC_BYTESWAP |