| Index: Source/WebCore/loader/FTPDirectoryParser.cpp
|
| diff --git a/Source/WebCore/loader/FTPDirectoryParser.cpp b/Source/WebCore/loader/FTPDirectoryParser.cpp
|
| index 6a05c4c6022e1666cda3d121522291fc260bf67b..2a0d1707848d6b3da00abc55310ee08e817e4679 100644
|
| --- a/Source/WebCore/loader/FTPDirectoryParser.cpp
|
| +++ b/Source/WebCore/loader/FTPDirectoryParser.cpp
|
| @@ -24,10 +24,7 @@
|
| #if ENABLE(FTPDIR)
|
| #include "FTPDirectoryParser.h"
|
|
|
| -#if PLATFORM(QT)
|
| -#include <QDateTime>
|
| -// On Windows, use the threadsafe *_r functions provided by pthread.
|
| -#elif OS(WINDOWS) && (USE(PTHREADS) || HAVE(PTHREAD_H))
|
| +#if OS(WINDOWS) && (USE(PTHREADS) || HAVE(PTHREAD_H))
|
| #include <pthread.h>
|
| #endif
|
|
|
| @@ -37,38 +34,7 @@
|
| using namespace WTF;
|
|
|
| namespace WebCore {
|
| -#if PLATFORM(QT) && defined(Q_WS_WIN32)
|
| -
|
| -// Replacement for gmtime_r() which is not available on MinGW.
|
| -// We use this on Win32 Qt platform for portability.
|
| -struct tm gmtimeQt(const QDateTime& input)
|
| -{
|
| - tm result;
|
| -
|
| - QDate date(input.date());
|
| - result.tm_year = date.year() - 1900;
|
| - result.tm_mon = date.month();
|
| - result.tm_mday = date.day();
|
| - result.tm_wday = date.dayOfWeek();
|
| - result.tm_yday = date.dayOfYear();
|
| -
|
| - QTime time(input.time());
|
| - result.tm_sec = time.second();
|
| - result.tm_min = time.minute();
|
| - result.tm_hour = time.hour();
|
| -
|
| - return result;
|
| -}
|
| -
|
| -static struct tm *gmtimeQt(const time_t *const timep, struct tm *result)
|
| -{
|
| - const QDateTime dt(QDateTime::fromTime_t(*timep));
|
| - *result = WebCore::gmtimeQt(dt);
|
| - return result;
|
| -}
|
| -
|
| -#define gmtime_r(x, y) gmtimeQt(x, y)
|
| -#elif OS(WINDOWS) && !defined(gmtime_r)
|
| +#if OS(WINDOWS) && !defined(gmtime_r)
|
| #if defined(_MSC_VER) && (_MSC_VER >= 1400)
|
| #define gmtime_r(x, y) gmtime_s((y), (x))
|
| #else /* !_MSC_VER */
|
|
|