Build fix for gcc 4.3 and Gtk.
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Apr 2008 09:31:58 +0000 (09:31 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 18 Apr 2008 09:31:58 +0000 (09:31 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@32198 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/profiler/FunctionCallProfile.cpp
JavaScriptCore/profiler/Profiler.cpp
WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/storage/LocalStorage.h

index 67e946a..282e2d8 100644 (file)
@@ -1,3 +1,10 @@
+2008-04-18  Simon Hausmann  <hausmann@webkit.org>
+
+        Build fix for gcc 4.3. Include stdio.h for printf.
+
+        * profiler/FunctionCallProfile.cpp:
+        * profiler/Profiler.cpp:
+
 2008-04-17  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Reviewed by mrowe.
index cc594ec..ec15739 100644 (file)
@@ -32,6 +32,8 @@
 #include "Profiler.h"
 #include "DateMath.h"
 
+#include <stdio.h>
+
 namespace KJS {
 
 FunctionCallProfile::FunctionCallProfile(const UString& name)
index 48d09d7..20b4a3c 100644 (file)
@@ -33,6 +33,8 @@
 #include <kjs/ExecState.h>
 #include <kjs/function.h>
 
+#include <stdio.h>
+
 namespace KJS {
 
 static Profiler* sharedProfiler = 0;
index 005adaf..e53b871 100644 (file)
@@ -1,3 +1,12 @@
+2008-04-18  Simon Hausmann  <hausmann@webkit.org>
+
+        Build fix for Gtk and gcc 4.3.
+
+        * GNUmakefile.am: Added missing files and include paths.
+        * storage/LocalStorage.h: Include LocalStorageArea.h instead of
+        forward declaring it due to the HashMap use where gcc 4.3 needs to
+        see the class.
+
 2008-04-17  Antti Koivisto  <antti@apple.com>
 
         Reviewed by Oliver.
index e268abb..575281d 100644 (file)
@@ -11,6 +11,7 @@ webcore_cppflags += \
        -I$(srcdir)/WebCore/platform/graphics \
        -I$(srcdir)/WebCore/platform/text \
        -I$(srcdir)/WebCore/loader \
+       -I$(srcdir)/WebCore/loader/appcache \
        -I$(srcdir)/WebCore/loader/archive \
        -I$(srcdir)/WebCore/loader/icon \
        -I$(srcdir)/WebCore/css \
@@ -1165,8 +1166,12 @@ webcore_sources += \
        WebCore/storage/DatabaseTask.cpp \
        WebCore/storage/DatabaseThread.cpp \
        WebCore/storage/DatabaseTracker.cpp \
+       WebCore/storage/LocalStorage.cpp \
+       WebCore/storage/LocalStorageArea.cpp \
        WebCore/storage/OriginQuotaManager.cpp \
        WebCore/storage/OriginUsageRecord.cpp \
+       WebCore/storage/StorageArea.cpp \
+       WebCore/storage/StorageMap.cpp \
        WebCore/storage/SQLResultSet.cpp \
        WebCore/storage/SQLResultSetRowList.cpp \
        WebCore/storage/SQLStatement.cpp \
index 4c13e5a..6761022 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef LocalStorage_h
 #define LocalStorage_h
 
+#include "LocalStorageArea.h"
 #include "SecurityOriginHash.h"
 
 #include <wtf/HashMap.h>
@@ -33,7 +34,6 @@
 
 namespace WebCore {
 
-    class LocalStorageArea;
     class PageGroup;
     class StorageArea;