2010-03-03 Fridrich Strba <fridrich.strba@bluewin.ch>

        Reviewed by Xan Lopez.

        Miscellaneous little fixes for the windows build of webkit-gtk
        https://bugs.webkit.org/show_bug.cgi?id=35640

        * GNUmakefile.am: On Windows with GCC, presence of
        __declspec(dllexport) on some symbols disables the autoexport/autoimport
        feature for all others. Using regex here assures that all symbols that
        need to be exported in the dll are actually exported.
2010-03-03  Fridrich Strba  <fridrich.strba@bluewin.ch>

        Reviewed by Xan Lopez.

        Miscellaneous little fixes for the windows build of webkit-gtk
        https://bugs.webkit.org/show_bug.cgi?id=35640

        * GNUmakefile.am: dist two new files concerning mathml support.
2010-03-03  Fridrich Strba  <fridrich.strba@bluewin.ch>

        Reviewed by Xan Lopez.

        Miscellaneous little fixes for the windows build of webkit-gtk
        https://bugs.webkit.org/show_bug.cgi?id=35640

        * webkit/webkitdownload.cpp: Windows headers define ERROR
        which breaks the build. Undef ERROR if it is defined.

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

diff --git a/ChangeLog b/ChangeLog
index 63bfd52e47d8d6df0d0928d4fc52e2f142ac7c6a..ff7405a01c4395e68b664f245c441c0493f1011e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-03  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Xan Lopez.
+
+        Miscellaneous little fixes for the windows build of webkit-gtk
+        https://bugs.webkit.org/show_bug.cgi?id=35640
+
+        * GNUmakefile.am: On Windows with GCC, presence of
+        __declspec(dllexport) on some symbols disables the autoexport/autoimport
+        feature for all others. Using regex here assures that all symbols that 
+        need to be exported in the dll are actually exported.
+
 2010-03-02  Arno Renevier  <arno@renevier.net>
 
         Reviewed by Gustavo Noronha Silva.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 5a25554bbeab860f7dc1655fecdb75f10387adcf..dbcd52a2f57bb461781ab0aba68129f8fe9a2942 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -142,6 +142,7 @@ global_cxxflags += \
 # It breaks the build on other platforms, so we use it conditionally
 if OS_WIN32
 no_undefined = -no-undefined
+version_script = -export-symbols-regex "^(webkit_|JS).*"
 endif
 
 if OS_GNU

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 96ce5617a07c9fa9e5ae03208271a0a541890e4f..c9a5a9257357b2e895229dcaee98fd9925f1d292 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-03  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Xan Lopez.
+
+        Miscellaneous little fixes for the windows build of webkit-gtk
+        https://bugs.webkit.org/show_bug.cgi?id=35640
+
+        * GNUmakefile.am: dist two new files concerning mathml support.
+
 2010-03-03  Xan Lopez  <xlopez@igalia.com>
 
         Unreviewed distcheck fix.

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 685140c02248228362847f1d1321ea9e322bc73c..15b13ba3f4399c1cab330aea577b22e6db8a9919 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2766,6 +2766,8 @@ webcore_sources += \
        WebCore/mathml/MathMLTextElement.h \
        WebCore/mathml/RenderMathMLBlock.cpp \
        WebCore/mathml/RenderMathMLBlock.h \
+       WebCore/mathml/RenderMathMLSubSup.cpp \
+       WebCore/mathml/RenderMathMLSubSup.h \
        WebCore/mathml/RenderMathMLUnderOver.cpp \
        WebCore/mathml/RenderMathMLUnderOver.h
 

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 4db23d941b524286affb586280123e6ae150cb37..408809e13980d95f9631ce9dbcfc7a4baf4de9de 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-03  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Xan Lopez.
+
+        Miscellaneous little fixes for the windows build of webkit-gtk
+        https://bugs.webkit.org/show_bug.cgi?id=35640
+
+        * webkit/webkitdownload.cpp: Windows headers define ERROR
+        which breaks the build. Undef ERROR if it is defined.
+
 2010-03-03  Philippe Normand  <pnormand@igalia.com>
 
         Unreviewed, build fix after r55452.

diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp
index 8f3214e9f9c6d580b53309b68711d127e831d492..878bf8b89de357e0d7c85590dbcaf0515385a2e5 100644 (file)
--- a/WebKit/gtk/webkit/webkitdownload.cpp
+++ b/WebKit/gtk/webkit/webkitdownload.cpp
@@ -37,6 +37,10 @@
 
 #include <glib/gstdio.h>
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 using namespace WebKit;
 using namespace WebCore;