diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
| commit | 1edef79f87f9c52c21d69c87c19f8e2b140a9119 (patch) | |
| tree | cad337ef493b0d9710bf3ae478cb87cb534f598d /WebCore/loader/FTPDirectoryDocument.cpp | |
| parent | b83fc086000e27bc227580bd0e35b9d7bee1179a (diff) | |
| parent | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (diff) | |
| download | external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.zip external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.gz external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.bz2 | |
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
Diffstat (limited to 'WebCore/loader/FTPDirectoryDocument.cpp')
| -rw-r--r-- | WebCore/loader/FTPDirectoryDocument.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/loader/FTPDirectoryDocument.cpp b/WebCore/loader/FTPDirectoryDocument.cpp index 188c84c..ace4cfe 100644 --- a/WebCore/loader/FTPDirectoryDocument.cpp +++ b/WebCore/loader/FTPDirectoryDocument.cpp @@ -235,7 +235,11 @@ static struct tm *localTimeQt(const time_t *const timep, struct tm *result) #define localtime_r(x, y) localTimeQt(x, y) #elif PLATFORM(WIN_OS) && !defined(localtime_r) +#if defined(_MSC_VER) && (_MSC_VER >= 1400) #define localtime_r(x, y) localtime_s((y), (x)) +#else /* !_MSC_VER */ +#define localtime_r(x,y) (localtime(x)?(*(y)=*localtime(x),(y)):0) +#endif #endif static String processFileDateString(const FTPTime& fileTime) |