Windows build fix.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ec30167b26aae5202aa7eacdbf3eaa5fc5abd836..6c0735ac353bfa2024e7cee4ba9cd81931b5c6e5 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-17  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Holger.
+
+        Windows build fix. (use localtime_r again instead of _s)
+
+        * loader/FTPDirectoryDocument.cpp:
+        (WebCore::processFileDateString):
+
 2008-01-17  Frans Englich  <fenglich@trolltech.com>
 
         Reviewed by Simon Hausmann <hausmann@webkit.org>.

diff --git a/WebCore/loader/FTPDirectoryDocument.cpp b/WebCore/loader/FTPDirectoryDocument.cpp
index 3bf687a9ef98a100018e76965d4dd4a6e7908010..beab88c05d64395ed8fd76ab2bcc097a0a32f43c 100644 (file)
--- a/WebCore/loader/FTPDirectoryDocument.cpp
+++ b/WebCore/loader/FTPDirectoryDocument.cpp
@@ -238,7 +238,7 @@ static struct tm *localTimeQt(const time_t *const timep, struct tm *result)
     return result;
 }
 
-#define localtime_s(x, y) localTimeQt(x, y)
+#define localtime_r(x, y) localTimeQt(x, y)
 #endif
 
 static String processFileDateString(const FTPTime& fileTime)
@@ -266,7 +266,7 @@ static String processFileDateString(const FTPTime& fileTime)
     // If it was today or yesterday, lets just do that - but we have to compare to the current time
     struct tm now;
     time_t now_t = time(NULL);
-    localtime_s(&now_t, &now);
+    localtime_r(&now_t, &now);
     
     // localtime does "year = current year - 1900", compensate for that for readability and comparison purposes
     now.tm_year += 1900;