From c82c4f93f0405f85af5842be15914fde88cde4e3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Moutte?= Date: Tue, 30 May 2006 20:25:03 +0000 Subject: [PATCH] gst/gst.c: set #include in a #ifdef #ifdef HAVE_FORK Original commit message from CVS: * gst/gst.c: set #include in a #ifdef #ifdef HAVE_FORK * win32/common/libgstbase.def: export gst_collect_pads_set_flushing * win32/common/libgstreamer.def: export gst_pad_set_acceptcaps_function, gst_structure_empty_new, gst_value_fraction_multiply * win32/vs6/gst_inspect.dsp: add a link to intl.lib --- ChangeLog | 12 ++++++++++++ gst/gst.c | 2 ++ win32/common/libgstbase.def | 1 + win32/common/libgstreamer.def | 3 +++ win32/vs6/gst_inspect.dsp | 4 ++-- 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 594dbc2..e71acd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-05-30 Sebastien Moutte + + * gst/gst.c: + set #include in a #ifdef #ifdef HAVE_FORK + * win32/common/libgstbase.def: + export gst_collect_pads_set_flushing + * win32/common/libgstreamer.def: + export gst_pad_set_acceptcaps_function, gst_structure_empty_new, + gst_value_fraction_multiply + * win32/vs6/gst_inspect.dsp: + add a link to intl.lib + 2006-05-30 Wim Taymans * libs/gst/base/gstcollectpads.c: (gst_collect_pads_remove_pad), diff --git a/gst/gst.c b/gst/gst.c index 5812553..853cd85 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -105,7 +105,9 @@ #include #include #include +#ifdef HAVE_FORK #include +#endif //HAVE_FORK #include #include "gst-i18n-lib.h" diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def index dc6e392..d6f0080 100644 --- a/win32/common/libgstbase.def +++ b/win32/common/libgstbase.def @@ -39,6 +39,7 @@ EXPORTS gst_collect_pads_pop gst_collect_pads_read gst_collect_pads_remove_pad + gst_collect_pads_set_flushing gst_collect_pads_set_function gst_collect_pads_start gst_collect_pads_stop diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def index 80b3c0a..ee0e218 100644 --- a/win32/common/libgstreamer.def +++ b/win32/common/libgstreamer.def @@ -437,6 +437,7 @@ EXPORTS gst_pad_remove_data_probe gst_pad_remove_event_probe gst_pad_send_event + gst_pad_set_acceptcaps_function gst_pad_set_activate_function gst_pad_set_activatepull_function gst_pad_set_activatepush_function @@ -586,6 +587,7 @@ EXPORTS gst_stream_error_get_type gst_stream_error_quark gst_structure_copy + gst_structure_empty_new gst_structure_fixate_field_boolean gst_structure_fixate_field_nearest_double gst_structure_fixate_field_nearest_fraction @@ -692,6 +694,7 @@ EXPORTS gst_value_array_get_type gst_value_array_get_value gst_value_compare + gst_value_fraction_multiply gst_value_get_caps gst_value_get_double_range_max gst_value_get_double_range_min diff --git a/win32/vs6/gst_inspect.dsp b/win32/vs6/gst_inspect.dsp index 8c32c7f..4560d55 100644 --- a/win32/vs6/gst_inspect.dsp +++ b/win32/vs6/gst_inspect.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib /nologo /subsystem:console /machine:I386 /out:"Release/gst-inspect-0.10.exe" +# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib intl.lib /nologo /subsystem:console /machine:I386 /out:"Release/gst-inspect-0.10.exe" # Begin Special Build Tool TargetPath=.\Release\gst-inspect-0.10.exe SOURCE="$(InputPath)" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/gst-inspect-0.10.exe" /pdbtype:sept +# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib intl.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/gst-inspect-0.10.exe" /pdbtype:sept # Begin Special Build Tool TargetPath=.\Debug\gst-inspect-0.10.exe SOURCE="$(InputPath)" -- 2.7.4