diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-03 12:24:51 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-09-04 10:41:01 (GMT) |
| commit | 5a37d2645d01d8f2aa3c001b99a745379eccb952 (patch) | |
| tree | 0e35f37f93fb34374ff6d0c62cec050627b6db6c /src | |
| parent | 74a637bb29c1ab94cc378f5640f7b834a79a0b10 (diff) | |
| download | Qt-5a37d2645d01d8f2aa3c001b99a745379eccb952.zip Qt-5a37d2645d01d8f2aa3c001b99a745379eccb952.tar.gz Qt-5a37d2645d01d8f2aa3c001b99a745379eccb952.tar.bz2 | |
Fix compilation on AIX: struct tm has no timezone information.
"/pulse/qt/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h", line 113.42: 1540-0217 (S) "tm_gmtoff" is not a member of "struct tm".
"/pulse/qt/src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h", line 115.37: 1540-0217 (S) "tm_zone" is not member of "struct tm".
Conflicts:
src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.cpp
src/3rdparty/webkit/JavaScriptCore/wtf/DateMath.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h index e531a63..12af356 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -474,7 +474,7 @@ #endif #if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(QNX) \ - && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) + && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) && !PLATFORM(AIX) #define HAVE_TM_GMTOFF 1 #define HAVE_TM_ZONE 1 #define HAVE_TIMEGM 1 |