Title: [150019] trunk/Source/WTF
Revision
150019
Author
[email protected]
Date
2013-05-13 09:19:48 -0700 (Mon, 13 May 2013)

Log Message

Unreviewed. Fix Qt Linux MIPS32R2 build after r149879.

Bring back GLIB_CHECK_VERSION for GBytes since Qt Linux MIPS32R2
depends on glib 2.24.2.

* wtf/gobject/GRefPtr.cpp:
(_GBytes):
(WTF::refGPtr):
(WTF::derefGPtr):

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (150018 => 150019)


--- trunk/Source/WTF/ChangeLog	2013-05-13 15:45:52 UTC (rev 150018)
+++ trunk/Source/WTF/ChangeLog	2013-05-13 16:19:48 UTC (rev 150019)
@@ -1,3 +1,15 @@
+2013-05-13  Carlos Garcia Campos  <[email protected]>
+
+        Unreviewed. Fix Qt Linux MIPS32R2 build after r149879.
+
+        Bring back GLIB_CHECK_VERSION for GBytes since Qt Linux MIPS32R2
+        depends on glib 2.24.2.
+
+        * wtf/gobject/GRefPtr.cpp:
+        (_GBytes):
+        (WTF::refGPtr):
+        (WTF::derefGPtr):
+
 2013-05-13  Anders Carlsson  <[email protected]>
 
         Remove UnusedParam.h

Modified: trunk/Source/WTF/wtf/gobject/GRefPtr.cpp (150018 => 150019)


--- trunk/Source/WTF/wtf/gobject/GRefPtr.cpp	2013-05-13 15:45:52 UTC (rev 150018)
+++ trunk/Source/WTF/wtf/gobject/GRefPtr.cpp	2013-05-13 16:19:48 UTC (rev 150019)
@@ -63,6 +63,7 @@
         g_main_loop_unref(ptr);
 }
 
+#if GLIB_CHECK_VERSION(2, 32, 0)
 template <> GBytes* refGPtr(GBytes* ptr)
 {
     if (ptr)
@@ -76,6 +77,23 @@
         g_bytes_unref(ptr);
 }
 
+# else
+
+typedef struct _GBytes {
+    bool fake;
+} GBytes;
+
+template <> GBytes* refGPtr(GBytes* ptr)
+{
+    return ptr;
+}
+
+template <> void derefGPtr(GBytes* ptr)
+{
+}
+
+#endif
+
 template <> GVariant* refGPtr(GVariant* ptr)
 {
     if (ptr)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to