I'm attaching a patch for WebCore/platform/FileSystem.h. This patch changes
the order of some #if/#else/#elif so that when building webkitgtk for win32,
the gtk mechanisms (e.g. GModule) are used rather than win32 mechanisms (e.g.
HMODULE).
It also adds ==, < and != to the platform version class because these
operations are used on certain platforms but were not defined.
Phil
--- webkit-1.1.15.1.orig/WebCore/platform/FileSystem.h 2009-10-01 21:33:07.000000000 -0400
+++ webkit-1.1.15.1/WebCore/platform/FileSystem.h 2009-10-02 08:20:02.000000000 -0400
@@ -90,12 +90,34 @@
{
}
+ inline bool operator==(const PlatformModuleVersion& other)
+ {
+ return (mostSig == other.mostSig && leastSig == other.leastSig);
+ }
+
+ inline bool operator>(const PlatformModuleVersion& other)
+ {
+ return (mostSig > other.mostSig ||
+ (mostSig == other.mostSig && leastSig > other.leastSig));
+ }
+
+ inline bool operator!=(const PlatformModuleVersion& other)
+ {
+ return (mostSig != other.mostSig || leastSig != other.leastSig);
+ }
+
};
#else
typedef QLibrary* PlatformModule;
typedef unsigned PlatformModuleVersion;
#endif
+#elif PLATFORM(GTK)
+typedef int PlatformFileHandle;
+typedef GModule* PlatformModule;
+const PlatformFileHandle invalidPlatformFileHandle = -1;
+typedef unsigned PlatformModuleVersion;
+
#elif PLATFORM(WIN_OS)
typedef HANDLE PlatformFileHandle;
typedef HMODULE PlatformModule;
@@ -119,14 +141,26 @@
{
}
+ inline bool operator==(const PlatformModuleVersion& other)
+ {
+ return (mostSig == other.mostSig && leastSig == other.leastSig);
+ }
+
+ inline bool operator>(const PlatformModuleVersion& other)
+ {
+ return (mostSig > other.mostSig ||
+ (mostSig == other.mostSig && leastSig > other.leastSig));
+ }
+
+ inline bool operator!=(const PlatformModuleVersion& other)
+ {
+ return (mostSig != other.mostSig || leastSig != other.leastSig);
+ }
+
};
#else
typedef int PlatformFileHandle;
-#if PLATFORM(GTK)
-typedef GModule* PlatformModule;
-#else
typedef void* PlatformModule;
-#endif
const PlatformFileHandle invalidPlatformFileHandle = -1;
typedef unsigned PlatformModuleVersion;
_______________________________________________
webkit-gtk mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-gtk
