- Revision
- 125895
- Author
- [email protected]
- Date
- 2012-08-17 07:16:23 -0700 (Fri, 17 Aug 2012)
Log Message
[Qt] QNX build fails due to ctype usage in system headers
https://bugs.webkit.org/show_bug.cgi?id=93849
Patch by Milian Wolff <[email protected]> on 2012-08-17
Reviewed by Simon Hausmann.
Move the check for whether DisallowCType should be active or not
to the DisallowCType.h header. This way, we can update the list
of platforms or OSes which do not work with this header in a
central place. All users can now safely include the header
and do not need to place custom guards around it.
Source/_javascript_Core:
* config.h:
Source/WebCore:
* config.h:
Source/WTF:
* config.h:
* wtf/DisallowCType.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (125894 => 125895)
--- trunk/Source/_javascript_Core/ChangeLog 2012-08-17 14:11:02 UTC (rev 125894)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-08-17 14:16:23 UTC (rev 125895)
@@ -1,3 +1,18 @@
+2012-08-17 Milian Wolff <[email protected]>
+
+ [Qt] QNX build fails due to ctype usage in system headers
+ https://bugs.webkit.org/show_bug.cgi?id=93849
+
+ Reviewed by Simon Hausmann.
+
+ Move the check for whether DisallowCType should be active or not
+ to the DisallowCType.h header. This way, we can update the list
+ of platforms or OSes which do not work with this header in a
+ central place. All users can now safely include the header
+ and do not need to place custom guards around it.
+
+ * config.h:
+
2012-08-16 Simon Hausmann <[email protected]>
[Qt] Replace use of internal Weak smart pointer with JSWeakObjectMap
Modified: trunk/Source/_javascript_Core/config.h (125894 => 125895)
--- trunk/Source/_javascript_Core/config.h 2012-08-17 14:11:02 UTC (rev 125894)
+++ trunk/Source/_javascript_Core/config.h 2012-08-17 14:16:23 UTC (rev 125895)
@@ -69,12 +69,7 @@
#include <wtf/FastMalloc.h>
#endif
-// this breaks compilation of <QFontDatabase>, at least, so turn it off for now
-// Also generates errors on wx on Windows and QNX, because these functions
-// are used from wx and QNX headers.
-#if !PLATFORM(QT) && !PLATFORM(WX) && !OS(QNX)
#include <wtf/DisallowCType.h>
-#endif
#if COMPILER(MSVC)
#define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1
Modified: trunk/Source/WTF/ChangeLog (125894 => 125895)
--- trunk/Source/WTF/ChangeLog 2012-08-17 14:11:02 UTC (rev 125894)
+++ trunk/Source/WTF/ChangeLog 2012-08-17 14:16:23 UTC (rev 125895)
@@ -1,5 +1,21 @@
2012-08-17 Milian Wolff <[email protected]>
+ [Qt] QNX build fails due to ctype usage in system headers
+ https://bugs.webkit.org/show_bug.cgi?id=93849
+
+ Reviewed by Simon Hausmann.
+
+ Move the check for whether DisallowCType should be active or not
+ to the DisallowCType.h header. This way, we can update the list
+ of platforms or OSes which do not work with this header in a
+ central place. All users can now safely include the header
+ and do not need to place custom guards around it.
+
+ * config.h:
+ * wtf/DisallowCType.h:
+
+2012-08-17 Milian Wolff <[email protected]>
+
[Qt] QNX build fails due to missing timegm declaration
https://bugs.webkit.org/show_bug.cgi?id=93842
Modified: trunk/Source/WTF/config.h (125894 => 125895)
--- trunk/Source/WTF/config.h 2012-08-17 14:11:02 UTC (rev 125894)
+++ trunk/Source/WTF/config.h 2012-08-17 14:16:23 UTC (rev 125895)
@@ -62,12 +62,7 @@
#include <wtf/FastMalloc.h>
#endif
-// this breaks compilation of <QFontDatabase>, at least, so turn it off for now
-// Also generates errors on wx on Windows and QNX, because these functions
-// are used from wx and QNX headers.
-#if !PLATFORM(QT) && !PLATFORM(WX) && !OS(QNX)
#include <wtf/DisallowCType.h>
-#endif
#if COMPILER(MSVC)
#define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1
Modified: trunk/Source/WTF/wtf/DisallowCType.h (125894 => 125895)
--- trunk/Source/WTF/wtf/DisallowCType.h 2012-08-17 14:11:02 UTC (rev 125894)
+++ trunk/Source/WTF/wtf/DisallowCType.h 2012-08-17 14:16:23 UTC (rev 125895)
@@ -35,6 +35,14 @@
// ASCII-specific functions instead. This header makes sure we get a compile-time
// error if we use one of the <ctype.h> functions by accident.
+// this breaks compilation of <QFontDatabase>, at least, so turn it off for now
+// Also generates errors on wx on Windows, presumably because these functions
+// are used from wx headers. On GTK+ for Mac many GTK+ files include <libintl.h>
+// or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
+// isacii().
+#include <wtf/Platform.h>
+#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !defined(_LIBCPP_VERSION)
+
#include <ctype.h>
#undef isalnum
@@ -72,3 +80,5 @@
#define toupper toupper_WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h
#endif
+
+#endif
Modified: trunk/Source/WebCore/ChangeLog (125894 => 125895)
--- trunk/Source/WebCore/ChangeLog 2012-08-17 14:11:02 UTC (rev 125894)
+++ trunk/Source/WebCore/ChangeLog 2012-08-17 14:16:23 UTC (rev 125895)
@@ -1,3 +1,18 @@
+2012-08-17 Milian Wolff <[email protected]>
+
+ [Qt] QNX build fails due to ctype usage in system headers
+ https://bugs.webkit.org/show_bug.cgi?id=93849
+
+ Reviewed by Simon Hausmann.
+
+ Move the check for whether DisallowCType should be active or not
+ to the DisallowCType.h header. This way, we can update the list
+ of platforms or OSes which do not work with this header in a
+ central place. All users can now safely include the header
+ and do not need to place custom guards around it.
+
+ * config.h:
+
2012-08-17 Simon Hausmann <[email protected]>
Unreviewed trivial build fix: Correct file name in bindings/js/DOMTransaction.h used in HEADERS
Modified: trunk/Source/WebCore/config.h (125894 => 125895)
--- trunk/Source/WebCore/config.h 2012-08-17 14:11:02 UTC (rev 125894)
+++ trunk/Source/WebCore/config.h 2012-08-17 14:16:23 UTC (rev 125895)
@@ -88,14 +88,7 @@
#include <wx/defs.h>
#endif
-// this breaks compilation of <QFontDatabase>, at least, so turn it off for now
-// Also generates errors on wx on Windows, presumably because these functions
-// are used from wx headers. On GTK+ for Mac many GTK+ files include <libintl.h>
-// or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
-// isacii().
-#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !defined(_LIBCPP_VERSION)
#include <wtf/DisallowCType.h>
-#endif
#if COMPILER(MSVC)
#define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1
