From 3eb218f7dc50a389575e230d5d4300d4cc608d05 Mon Sep 17 00:00:00 2001 From: "andersca@apple.com" Date: Wed, 14 Nov 2007 02:33:51 +0000 Subject: [PATCH] Fix Windows build. * platform/Cursor.h: * plugins/win/PluginPackageWin.h: * plugins/win/PluginStreamWin.h: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27779 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 8 ++++++++ WebCore/platform/Cursor.h | 2 +- WebCore/plugins/win/PluginPackageWin.h | 4 ++-- WebCore/plugins/win/PluginStreamWin.h | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 3d93bc01b39d..222ffc096ea1 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,11 @@ +2007-11-13 Anders Carlsson + + Fix Windows build. + + * platform/Cursor.h: + * plugins/win/PluginPackageWin.h: + * plugins/win/PluginStreamWin.h: + 2007-11-13 Geoffrey Garen Reviewed by Anders Carlsson. diff --git a/WebCore/platform/Cursor.h b/WebCore/platform/Cursor.h index 2d53764b63b4..f1141838b6e1 100644 --- a/WebCore/platform/Cursor.h +++ b/WebCore/platform/Cursor.h @@ -31,7 +31,7 @@ #if PLATFORM(WIN) typedef struct HICON__* HICON; typedef HICON HCURSOR; -#include +#include #include #elif PLATFORM(GTK) #include diff --git a/WebCore/plugins/win/PluginPackageWin.h b/WebCore/plugins/win/PluginPackageWin.h index 2e61dd45d61d..e4eece6454f0 100644 --- a/WebCore/plugins/win/PluginPackageWin.h +++ b/WebCore/plugins/win/PluginPackageWin.h @@ -29,7 +29,7 @@ #include #include -#include "Shared.h" +#include "RefCounted.h" #include "Timer.h" #include "StringHash.h" #include "PlatformString.h" @@ -40,7 +40,7 @@ namespace WebCore { typedef HashMap MIMEToDescriptionsMap; typedef HashMap > MIMEToExtensionsMap; - class PluginPackageWin : public Shared { + class PluginPackageWin : public RefCounted { public: ~PluginPackageWin(); static PluginPackageWin* createPackage(const String& path, const FILETIME& lastModified); diff --git a/WebCore/plugins/win/PluginStreamWin.h b/WebCore/plugins/win/PluginStreamWin.h index ad94b1d29390..36da0f8dddca 100644 --- a/WebCore/plugins/win/PluginStreamWin.h +++ b/WebCore/plugins/win/PluginStreamWin.h @@ -36,7 +36,7 @@ #include "npfunctions.h" #include "NetscapePlugInStreamLoader.h" #include "PlatformString.h" -#include "Shared.h" +#include "RefCounted.h" #include "ResourceRequest.h" #include "ResourceResponse.h" #include "StringHash.h" @@ -48,7 +48,7 @@ namespace WebCore { enum PluginStreamState { StreamBeforeStarted, StreamStarted, StreamStopped }; - class PluginStreamWin : public Shared, private NetscapePlugInStreamLoaderClient { + class PluginStreamWin : public RefCounted, private NetscapePlugInStreamLoaderClient { public: PluginStreamWin(PluginViewWin*, Frame*, const ResourceRequest&, bool sendNotification, void* notifyData); ~PluginStreamWin(); -- 2.36.0