diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-04-27 18:41:43 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-04-27 18:41:43 +0000 |
| commit | 5b3fb22a546f87418f21fd79526d5210fb4f6c39 (patch) | |
| tree | 48e66d4d32a8abf86a5530478e8477689b8253ac /ACE/ace/OS_NS_time.h | |
| parent | c1e3c550b839be25e5492fdcdadf4e853ebbffe4 (diff) | |
| download | ATCD-5b3fb22a546f87418f21fd79526d5210fb4f6c39.tar.gz | |
Fri Apr 27 18:40:51 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/OS_NS_time.h:
* ace/config-win32-msvc-9.h:
First fixes for WinCE 7
Diffstat (limited to 'ACE/ace/OS_NS_time.h')
| -rw-r--r-- | ACE/ace/OS_NS_time.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index e5ae0bb2951..fde5aa58fd4 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -94,11 +94,11 @@ inline long ace_timezone() #if !defined (ACE_LACKS_DIFFTIME) -# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) \ +# if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ && defined (_MSC_VER) - // The WinCE 6.0 SDK ships with a diff_time that uses __time32_t as type + // The WinCE 6.0/7.0 SDK ships with a diff_time that uses __time32_t as type // not time_t. This resolves in compilation warnings because time_t - // can be 64bit. Disable at this momemt the warning for just this method + // can be 64bit. Disable at this moment the warning for just this method // else we get two compile warnings on each source file that includes // this file. # pragma warning (push) @@ -117,7 +117,7 @@ inline double ace_difftime(time_t t1, time_t t0) { return difftime (t1, t0); } -# if defined (_WIN32_WCE) && (_WIN32_WCE == 0x600) && !defined (_USE_32BIT_TIME_T) \ +# if defined (_WIN32_WCE) && ((_WIN32_WCE >= 0x600) && (_WIN32_WCE <= 0x700)) && !defined (_USE_32BIT_TIME_T) \ && defined (_MSC_VER) # pragma warning (pop) # endif |