Bug 23057 – PurgeableBuffer #defines leave out functions on gtk MacOSX 10.4 build

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Luke Kenneth Casson Leighton]

diff --git a/WebCore/platform/PurgeableBuffer.h b/WebCore/platform/PurgeableBuff
index b8b5c73..20f0ed8 100644
--- a/WebCore/platform/PurgeableBuffer.h
+++ b/WebCore/platform/PurgeableBuffer.h
@@ -62,14 +62,14 @@ namespace WebCore {
         mutable State m_state;
     };
 
-#if !PLATFORM(DARWIN) || defined(BUILDING_ON_TIGER) || PLATFORM(QT)
+/*#if !PLATFORM(DARWIN) || defined(BUILDING_ON_TIGER) || PLATFORM(QT)*/
     inline PurgeableBuffer* PurgeableBuffer::create(const char*, size_t) { retu
     inline PurgeableBuffer::~PurgeableBuffer() { }
     inline const char* PurgeableBuffer::data() const { return 0; }
     inline void PurgeableBuffer::setPurgePriority(PurgePriority) { }
     inline bool PurgeableBuffer::wasPurged() const { return false; }
     inline bool PurgeableBuffer::makePurgeable(bool) { return false; }
-#endif
+/*#endif*/
     
 }

[Luke Kenneth Casson Leighton]

removing these #defines on macosx 10.4 result in a successful build.
adding in PurgeableBuffermac.cpp (from WebCore/platform/mac) into
WebCore/GNUMakefile.am results in a compile error about VM_VOLATILE missing etc.

[Mark Rowe (bdash)]

Either things need to be changed such that BUILDING_ON_TIGER will be defined when building the GTK port on Tiger, or the #if needs to be changed to always disable things for GTK, similar to how it is for Qt.

[Luke Kenneth Casson Leighton]

oh - yes: i get it - "leave out" as in there's a #if defined(QT) which "brings in" the inline versions of the functions (in the header file) and adding || defined(GTK) ... i get it.

[Luke Kenneth Casson Leighton]

Created attachment 26365 [details]
add PLATFORM(GTK) to use inline versions of PurgeableBuffer functions

yep - that did it.

[Darin Adler]

Comment on attachment 26365 [details]
add PLATFORM(GTK) to use inline versions of PurgeableBuffer functions

The change looks fine, but this needs a ChangeLog, so setting review-. Please put up the same patch with a ChangeLog entry.

[Jan Alonzo]

Created attachment 31990 [details]
patch with changelog

[Eric Seidel (no email)]

Comment on attachment 31990 [details]
patch with changelog

Ok.

[Eric Seidel (no email)]

Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebCore/ChangeLog
	M	WebCore/platform/PurgeableBuffer.h
Committed r45327
http://trac.webkit.org/changeset/45327