Skip to content

Commit 397587d

Browse files
author
Alexander Matveev
committed
8241108: Glib improvements
Reviewed-by: kcr, ahgross, rhalade
1 parent 6900d29 commit 397587d

File tree

28 files changed

+306
-30298
lines changed

28 files changed

+306
-30298
lines changed

modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/build/win32/vs100/glib-lite.def

+200-201
Large diffs are not rendered by default.

modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib-autocleanups.h

+2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GPatternSpec, g_pattern_spec_free)
6565
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GQueue, g_queue_free)
6666
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GQueue, g_queue_clear)
6767
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRand, g_rand_free)
68+
#ifndef GSTREAMER_LITE
6869
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GRegex, g_regex_unref)
6970
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GMatchInfo, g_match_info_unref)
71+
#endif // GSTREAMER_LITE
7072
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GScanner, g_scanner_destroy)
7173
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSequence, g_sequence_free)
7274
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSList, g_slist_free)

modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/glib.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
#include <glib/grefcount.h>
7474
#ifndef GSTREAMER_LITE
7575
#include <glib/grefstring.h>
76-
#endif // GSTREAMER_LITE
7776
#include <glib/gregex.h>
77+
#endif // GSTREAMER_LITE
7878
#include <glib/gscanner.h>
7979
#include <glib/gsequence.h>
8080
#include <glib/gshell.h>

modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gregex.c

-3,189
This file was deleted.

modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/gregex.h

-609
This file was deleted.

modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/pcre/pcre.h

-507
This file was deleted.

modules/javafx.media/src/main/native/gstreamer/3rd_party/glib/glib/pcre/pcre_chartables.c

-196
This file was deleted.

0 commit comments

Comments
 (0)