Merge pull request #1299 from emutavchi/g_memdup2-build-fix

philn · web-flow · commit 7f73f8f6c0e1 · 2024-03-20T13:32:10.000Z
Fix build with glib &lt; 2.68
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
@@ -909,7 +909,11 @@ bool gstObjectHasProperty(GstPad* pad, const char* name)
 #if !GST_CHECK_VERSION(1, 20, 0)
 GstBuffer* gst_buffer_new_memdup(gconstpointer data, gsize size)
 {
+#if GLIB_CHECK_VERSION(2, 68, 0)
     gpointer data2 = g_memdup2(data, size);
+#else
+    gpointer data2 = g_memdup(data, size);
+#endif
 
     return gst_buffer_new_wrapped_full(static_cast<GstMemoryFlags>(0), data2, size, 0, size, data2, g_free);
 }

Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,11 @@ bool gstObjectHasProperty(GstPad* pad, const char* name)`
`909`	`909`	`#if !GST_CHECK_VERSION(1, 20, 0)`
`910`	`910`	`GstBuffer* gst_buffer_new_memdup(gconstpointer data, gsize size)`
`911`	`911`	`{`
	`912`	`+#if GLIB_CHECK_VERSION(2, 68, 0)`
`912`	`913`	`gpointer data2 = g_memdup2(data, size);`
	`914`	`+#else`
	`915`	`+ gpointer data2 = g_memdup(data, size);`
	`916`	`+#endif`
`913`	`917`
`914`	`918`	`return gst_buffer_new_wrapped_full(static_cast<GstMemoryFlags>(0), data2, size, 0, size, data2, g_free);`
`915`	`919`	`}`