From f396a37fc5df015ebedf143bdad8342ec79bfd11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 15 Oct 2010 23:54:40 +0100 Subject: [PATCH] rtsp: don't export marshaller function Make sure the marshaller function isn't exported. As it was never in a public header file, this should be fine. --- gst-libs/gst/rtsp/Makefile.am | 2 +- gst-libs/gst/rtsp/gstrtspextension.c | 2 +- win32/common/libgstrtsp.def | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index 95d7fcc0f6..39425ec225 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -42,7 +42,7 @@ BUILT_SOURCES = $(built_headers) $(built_sources) EXTRA_DIST = gstrtsp-marshal.list CLEANFILES = $(BUILT_SOURCES) -glib_gen_prefix = gst_rtsp +glib_gen_prefix = __gst_rtsp glib_enum_define = gst_rtsp glib_enum_headers = gstrtspdefs.h glib_gen_basename = gstrtsp diff --git a/gst-libs/gst/rtsp/gstrtspextension.c b/gst-libs/gst/rtsp/gstrtspextension.c index cef7a70ba8..32d5d8e3a7 100644 --- a/gst-libs/gst/rtsp/gstrtspextension.c +++ b/gst-libs/gst/rtsp/gstrtspextension.c @@ -84,7 +84,7 @@ gst_rtsp_extension_iface_init (GstRTSPExtension * iface) gst_rtsp_extension_signals[SIGNAL_SEND] = g_signal_new ("send", G_TYPE_FROM_CLASS (iface), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPExtensionInterface, - send), NULL, NULL, gst_rtsp_marshal_ENUM__POINTER_POINTER, + send), NULL, NULL, __gst_rtsp_marshal_ENUM__POINTER_POINTER, GST_TYPE_RTSP_RESULT, 2, G_TYPE_POINTER, G_TYPE_POINTER); initialized = TRUE; } diff --git a/win32/common/libgstrtsp.def b/win32/common/libgstrtsp.def index 4225dfa78c..1b904cb697 100644 --- a/win32/common/libgstrtsp.def +++ b/win32/common/libgstrtsp.def @@ -50,7 +50,6 @@ EXPORTS gst_rtsp_header_as_text gst_rtsp_header_field_get_type gst_rtsp_lower_trans_get_type - gst_rtsp_marshal_ENUM__POINTER_POINTER gst_rtsp_message_add_header gst_rtsp_message_append_headers gst_rtsp_message_dump