Attachment #27955 for bug #24151

View Details Raw Unified Return to Bug 24151



2009-02-24  Laszlo Gombos  <laszlo.1.gombos@nokia.com>

        Reviewed by NOBODY (OOPS!).

        https://bugs.webkit.org/show_bug.cgi?id=24151
        Fix S60 build break

        * platform/FileSystem.h: Create a default case for non-win and non-mac Qt builds
        * platform/qt/FileSystemQt.cpp: Ditto
        (WebCore::unloadModule):

2009-02-24  Ojan Vafai  <ojan@chromium.org>

        Reviewed by Eric Seidel.



#if defined(Q_WS_MAC)
typedef CFBundleRef PlatformModule;
typedef unsigned PlatformModuleVersion;
#elif defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_WS_S60)
typedef QLibrary* PlatformModule;
typedef unsigned PlatformModuleVersion;
#elif defined(Q_OS_WIN)
typedef HMODULE PlatformModule;
struct PlatformModuleVersion {

    }

};
#else
typedef QLibrary* PlatformModule;
typedef unsigned PlatformModuleVersion;
#endif

#else



    return 0;
}

#if defined(Q_WS_X11) || defined(Q_WS_QWS)
bool unloadModule(PlatformModule module)
{
#if defined(Q_WS_MAC)
    CFRelease(module);
    return true;

#elif defined(Q_OS_WIN)
    return ::FreeLibrary(module);

#else
    if (module->unload()) {
        delete module;
        return true;
    }
                        
    return false;
}
#endif

#if defined(Q_WS_MAC)
bool unloadModule(PlatformModule module)
{
    CFRelease(module);
    return true;
}
#endif

#if defined(Q_OS_WIN)
bool unloadModule(PlatformModule module)
{
    return ::FreeLibrary(module);
}
#endif

}


Return to Bug 24151

Lines 97-105 const PlatformFileHandle invalidPlatform WebCore/platform/FileSystem.h_sec1
- WebCore/platform/FileSystem.h -3 / +3 lines
97	#if defined(Q_WS_MAC)	97	#if defined(Q_WS_MAC)
98	typedef CFBundleRef PlatformModule;	98	typedef CFBundleRef PlatformModule;
99	typedef unsigned PlatformModuleVersion;	99	typedef unsigned PlatformModuleVersion;
100	#elif defined(Q_WS_X11) \|\| defined(Q_WS_QWS) \|\| defined(Q_WS_S60)
101	typedef QLibrary* PlatformModule;
102	typedef unsigned PlatformModuleVersion;
103	#elif defined(Q_OS_WIN)	100	#elif defined(Q_OS_WIN)
104	typedef HMODULE PlatformModule;	101	typedef HMODULE PlatformModule;
105	struct PlatformModuleVersion {	102	struct PlatformModuleVersion {
Lines 119-124 struct PlatformModuleVersion { WebCore/platform/FileSystem.h_sec2
119	}	116	}
120		117
121	};	118	};
		119	#else
		120	typedef QLibrary* PlatformModule;
		121	typedef unsigned PlatformModuleVersion;
122	#endif	122	#endif
123		123
124	#else	124	#else

Lines 143-174 int writeToFile(PlatformFileHandle handl WebCore/platform/qt/FileSystemQt.cpp_sec1
- WebCore/platform/qt/FileSystemQt.cpp -17 / +9 lines
143	return 0;	143	return 0;
144	}	144	}
145		145
146	#if defined(Q_WS_X11) \|\| defined(Q_WS_QWS)
147	bool unloadModule(PlatformModule module)	146	bool unloadModule(PlatformModule module)
148	{	147	{
		148	#if defined(Q_WS_MAC)
		149	CFRelease(module);
		150	return true;
		151
		152	#elif defined(Q_OS_WIN)
		153	return ::FreeLibrary(module);
		154
		155	#else
149	if (module->unload()) {	156	if (module->unload()) {
150	delete module;	157	delete module;
151	return true;	158	return true;
152	}	159	}
153		160
154	return false;	161	return false;
155	}
156	#endif	162	#endif
157
158	#if defined(Q_WS_MAC)
159	bool unloadModule(PlatformModule module)
160	{
161	CFRelease(module);
162	return true;
163	}
164	#endif
165
166	#if defined(Q_OS_WIN)
167	bool unloadModule(PlatformModule module)
168	{
169	return ::FreeLibrary(module);
170	}	163	}
171	#endif
172		164
173	}	165	}
174		166

Lines 1-3 WebCore/ChangeLog_sec1
- WebCore/ChangeLog +11 lines
		1	2009-02-24 Laszlo Gombos <laszlo.1.gombos@nokia.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	https://bugs.webkit.org/show_bug.cgi?id=24151
		6	Fix S60 build break
		7
		8	* platform/FileSystem.h: Create a default case for non-win and non-mac Qt builds
		9	* platform/qt/FileSystemQt.cpp: Ditto
		10	(WebCore::unloadModule):
		11
1	2009-02-24 Ojan Vafai <ojan@chromium.org>	12	2009-02-24 Ojan Vafai <ojan@chromium.org>
2		13
3	Reviewed by Eric Seidel.	14	Reviewed by Eric Seidel.