8241108: Glib improvements

Reviewed-by: kcr, ahgross, rhalade
openjdk · Mar 20, 2020 · 397587d · 397587d
1 parent 6900d29
commit 397587d
Show file tree

Hide file tree

Showing 28 changed files with 306 additions and 30,298 deletions.
diff --git a/...les/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glib-lite.def b/...les/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glib-lite.def
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-autocleanups.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-autocleanups.h
@@ -65,8 +65,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GPatternSpec, g_pattern_spec_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GQueue, g_queue_free)
 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GQueue, g_queue_clear)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRand, g_rand_free)
+#ifndef GSTREAMER_LITE
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRegex, g_regex_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GMatchInfo, g_match_info_unref)
+#endif // GSTREAMER_LITE
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GScanner, g_scanner_destroy)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSequence, g_sequence_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSList, g_slist_free)

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib.h
@@ -73,8 +73,8 @@
 #include <glib/grefcount.h>
 #ifndef GSTREAMER_LITE
 #include <glib/grefstring.h>
-#endif // GSTREAMER_LITE
 #include <glib/gregex.h>
+#endif // GSTREAMER_LITE
 #include <glib/gscanner.h>
 #include <glib/gsequence.h>
 #include <glib/gshell.h>

diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gregex.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gregex.c
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gregex.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gregex.h
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/pcre/pcre.h b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/pcre/pcre.h
diff --git a/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/pcre/pcre_chartables.c b/modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/pcre/pcre_chartables.c