diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-09 12:54:46 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-09 12:54:46 +0000 |
| commit | 56209b642cd218fb23d807532dcab640485e4958 (patch) | |
| tree | 0430f0fd4f05a6ae72b6a05635c2660fe10fa07b | |
| parent | f263f5e17e4ed6624acdcdc3260903dabc08e994 (diff) | |
| download | ATCD-56209b642cd218fb23d807532dcab640485e4958.tar.gz | |
ChangeLogTag: Fri Jun 9 12:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/OS_NS_sys_stat.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 128c9010459..a54232d6ca1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,10 @@ Fri Jun 9 12:47:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_sys_stat.h: - On windows use _stati64 for ACE_stat, not __stat64. The first has + With vc71 use _stati64 for ACE_stat, not __stat64. The first has time as 32bit, the second time as 64 bit (__time64_t) which causes problems because the time interfaces of ACE use time_t which is - 32bit on windows. Maybe we have to introduce ACE_time_t and use - that in the interfaces :-( + 32bit with vc71 but 64bit with vc8. Fri Jun 9 10:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ace/OS_NS_sys_stat.h b/ace/OS_NS_sys_stat.h index 6a9f58e5728..811bcad26a9 100644 --- a/ace/OS_NS_sys_stat.h +++ b/ace/OS_NS_sys_stat.h @@ -38,7 +38,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_WIN32) && defined (__BORLANDC__) typedef struct stati64 ACE_stat; -#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined(__IBMCPP__) +#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined(__IBMCPP__) && ((defined _MSC_VER) && _MSC_VER >= 1400) +// For vc8 which has time_t as 64bit +typedef struct __stat64 ACE_stat; +#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined(__IBMCPP__) && ((defined _MSC_VER) && _MSC_VER >= 1300) +// For vc71 which has time_t as 32bit typedef struct _stati64 ACE_stat; #else typedef struct stat ACE_stat; |