[farsight2/master] Prevent fs_marshal_* functions from being exported
Olivier Crête
olivier.crete at collabora.co.uk
Tue Dec 23 15:21:26 PST 2008
---
configure.ac | 6 +++---
gst-libs/gst/farsight/Makefile.am | 6 +++---
gst-libs/gst/farsight/fs-element-added-notifier.c | 2 +-
gst-libs/gst/farsight/fs-participant.c | 2 +-
gst-libs/gst/farsight/fs-session.c | 2 +-
gst-libs/gst/farsight/fs-stream-transmitter.c | 16 ++++++++--------
gst-libs/gst/farsight/fs-stream.c | 18 +++++++++---------
gst-libs/gst/farsight/fs-transmitter.c | 2 +-
8 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/configure.ac b/configure.ac
index bcfbd31..f8a8fc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,17 +325,17 @@ AC_SUBST(FS2_ALL_LDFLAGS)
dnl FS2_LIB_LDFLAGS
dnl linker flags shared by all libraries
dnl LDFLAGS modifier defining exported symbols from built libraries
-FS2_LIB_LDFLAGS="-export-symbols-regex fs_.*"
+FS2_LIB_LDFLAGS="-export-symbols-regex ^fs_.*"
AC_SUBST(FS2_LIB_LDFLAGS)
dnl this really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-FS2_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*fs_init_plugin\$\$' $GST_ALL_LDFLAGS"
+FS2_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*fs_init_plugin\$\$' $FS2_ALL_LDFLAGS"
AC_SUBST(FS2_PLUGIN_LDFLAGS)
dnl this really should only contain flags, not libs - they get added before
dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $FS2_ALL_LDFLAGS"
AC_SUBST(GST_PLUGIN_LDFLAGS)
diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farsight/Makefile.am
index 9c17fd4..5a0e2e7 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farsight/Makefile.am
@@ -47,18 +47,18 @@ noinst_HEADERS = \
EXTRA_libgstfarsight_ at GST_MAJORMINOR@_la_SOURCES = fs-marshal.list
fs-marshal.h: Makefile fs-marshal.list
- glib-genmarshal --header --prefix=fs_marshal $(srcdir)/fs-marshal.list > fs-marshal.h.tmp
+ glib-genmarshal --header --prefix=_fs_marshal $(srcdir)/fs-marshal.list > fs-marshal.h.tmp
mv fs-marshal.h.tmp fs-marshal.h
fs-marshal.c: Makefile fs-marshal.list
echo "#include \"glib-object.h\"" >> fs-marshal.c.tmp
echo "#include \"fs-marshal.h\"" >> fs-marshal.c.tmp
- glib-genmarshal --body --prefix=fs_marshal $(srcdir)/fs-marshal.list >> fs-marshal.c.tmp
+ glib-genmarshal --body --prefix=_fs_marshal $(srcdir)/fs-marshal.list >> fs-marshal.c.tmp
mv fs-marshal.c.tmp fs-marshal.c
libgstfarsight_ at GST_MAJORMINOR@_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstfarsight_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
-libgstfarsight_ at GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+libgstfarsight_ at GST_MAJORMINOR@_la_LDFLAGS = $(FS2_LIB_LDFLAGS) $(FS2_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
public_headers = fs-candidate.h \
diff --git a/gst-libs/gst/farsight/fs-element-added-notifier.c b/gst-libs/gst/farsight/fs-element-added-notifier.c
index 0e27d32..b619e51 100644
--- a/gst-libs/gst/farsight/fs-element-added-notifier.c
+++ b/gst-libs/gst/farsight/fs-element-added-notifier.c
@@ -94,7 +94,7 @@ fs_element_added_notifier_class_init (FsElementAddedNotifierClass *klass)
0,
NULL,
NULL,
- fs_marshal_VOID__OBJECT_OBJECT,
+ _fs_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE, 2, GST_TYPE_BIN, GST_TYPE_ELEMENT);
g_type_class_add_private (klass, sizeof (FsElementAddedNotifierPrivate));
diff --git a/gst-libs/gst/farsight/fs-participant.c b/gst-libs/gst/farsight/fs-participant.c
index c2afe83..679592b 100644
--- a/gst-libs/gst/farsight/fs-participant.c
+++ b/gst-libs/gst/farsight/fs-participant.c
@@ -124,7 +124,7 @@ fs_participant_class_init (FsParticipantClass *klass)
0,
NULL,
NULL,
- fs_marshal_VOID__OBJECT_INT_STRING_STRING,
+ _fs_marshal_VOID__OBJECT_INT_STRING_STRING,
G_TYPE_NONE, 3, G_TYPE_OBJECT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
gobject_class->dispose = fs_participant_dispose;
diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index f94a073..814eb5f 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -250,7 +250,7 @@ fs_session_class_init (FsSessionClass *klass)
0,
NULL,
NULL,
- fs_marshal_VOID__OBJECT_INT_STRING_STRING,
+ _fs_marshal_VOID__OBJECT_INT_STRING_STRING,
G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
/**
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.c b/gst-libs/gst/farsight/fs-stream-transmitter.c
index 915053d..887f3db 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.c
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.c
@@ -153,7 +153,7 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
0,
NULL,
NULL,
- fs_marshal_VOID__INT_STRING_STRING,
+ _fs_marshal_VOID__INT_STRING_STRING,
G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
/**
@@ -171,13 +171,13 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
*/
signals[NEW_ACTIVE_CANDIDATE_PAIR] = g_signal_new
("new-active-candidate-pair",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL,
- NULL,
- fs_marshal_VOID__BOXED_BOXED,
- G_TYPE_NONE, 2, FS_TYPE_CANDIDATE, FS_TYPE_CANDIDATE);
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL,
+ NULL,
+ _fs_marshal_VOID__BOXED_BOXED,
+ G_TYPE_NONE, 2, FS_TYPE_CANDIDATE, FS_TYPE_CANDIDATE);
/**
* FsStreamTransmitter::new-local-candidate:
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index 46719c6..acd8c3c 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -239,7 +239,7 @@ fs_stream_class_init (FsStreamClass *klass)
0,
NULL,
NULL,
- fs_marshal_VOID__INT_STRING_STRING,
+ _fs_marshal_VOID__INT_STRING_STRING,
G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
/**
@@ -264,7 +264,7 @@ fs_stream_class_init (FsStreamClass *klass)
0,
NULL,
NULL,
- fs_marshal_VOID__BOXED_BOXED,
+ _fs_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2, GST_TYPE_PAD, FS_TYPE_CODEC);
/**
@@ -305,13 +305,13 @@ fs_stream_class_init (FsStreamClass *klass)
*/
signals[NEW_ACTIVE_CANDIDATE_PAIR] = g_signal_new
("new-active-candidate-pair",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL,
- NULL,
- fs_marshal_VOID__BOXED_BOXED,
- G_TYPE_NONE, 2, FS_TYPE_CANDIDATE, FS_TYPE_CANDIDATE);
+ G_TYPE_FROM_CLASS (klass),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL,
+ NULL,
+ _fs_marshal_VOID__BOXED_BOXED,
+ G_TYPE_NONE, 2, FS_TYPE_CANDIDATE, FS_TYPE_CANDIDATE);
/**
* FsStream::new-local-candidate:
diff --git a/gst-libs/gst/farsight/fs-transmitter.c b/gst-libs/gst/farsight/fs-transmitter.c
index c3b8e85..9858e5d 100644
--- a/gst-libs/gst/farsight/fs-transmitter.c
+++ b/gst-libs/gst/farsight/fs-transmitter.c
@@ -171,7 +171,7 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
0,
NULL,
NULL,
- fs_marshal_VOID__OBJECT_INT_STRING_STRING,
+ _fs_marshal_VOID__OBJECT_INT_STRING_STRING,
G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
--
1.5.6.5
More information about the farsight-commits
mailing list