From: <tp...@ke...> - 2007-01-05 13:23:17
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tpm Date: Fri Jan 05 2007 13:23:14 UTC Log message: Patch by: Vincent Torri <vtorri at univ-evry dot fr> * gst/gst_private.h: * gst/gstconfig.h.in: * gst/gstinfo.h: On win32, all the __declspec stuff for symbol exporting is apparently only needed with MSVC, but doesn't work with MingW. Fixes compilation with MingW and #391909. Modified files: . : ChangeLog gst : gst_private.h gstconfig.h.in gstinfo.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2981&r2=1.2982 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst_private.h.diff?r1=1.33&r2=1.34 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstconfig.h.in.diff?r1=1.22&r2=1.23 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstinfo.h.diff?r1=1.100&r2=1.101 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2981 retrieving revision 1.2982 diff -u -d -r1.2981 -r1.2982 --- ChangeLog 5 Jan 2007 11:57:48 -0000 1.2981 +++ ChangeLog 5 Jan 2007 13:23:02 -0000 1.2982 @@ -1,5 +1,16 @@ 2007-01-05 Tim-Philipp Müller <tim at centricular dot net> + Patch by: Vincent Torri <vtorri at univ-evry dot fr> + + * gst/gst_private.h: + * gst/gstconfig.h.in: + * gst/gstinfo.h: + On win32, all the __declspec stuff for symbol exporting is + apparently only needed with MSVC, but doesn't work with MingW. + Fixes compilation with MingW and #391909. +2007-01-05 Tim-Philipp Müller <tim at centricular dot net> * libs/gst/base/gstbasesrc.c: (gst_base_src_activate_push): Change some GST_ERROR_OBJECT that aren't really errors to GST_WARNING_OBJECT in order to reduce terminal spam. Index: gst_private.h RCS file: /cvs/gstreamer/gstreamer/gst/gst_private.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- gst_private.h 28 Sep 2006 14:00:43 -0000 1.33 +++ gst_private.h 5 Jan 2007 13:23:02 -0000 1.34 @@ -55,9 +55,9 @@ #ifndef GST_DISABLE_GST_DEBUG -#ifndef WIN32 +#ifndef _MSC_VER #define IMPORT_SYMBOL -#else +#else /* _MSC_VER */ #ifndef LIBGSTREAMER_EXPORTS #define IMPORT_SYMBOL __declspec(dllimport) #else Index: gstconfig.h.in RCS file: /cvs/gstreamer/gstreamer/gst/gstconfig.h.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- gstconfig.h.in 5 Oct 2006 12:31:07 -0000 1.22 +++ gstconfig.h.in 5 Jan 2007 13:23:02 -0000 1.23 @@ -191,14 +191,14 @@ * On Windows, this exports the plugin definition from the DLL. * On other platforms, this gets defined as a no-op. */ -#if defined(WIN32) && (!defined(__MINGW32__)) +#ifdef _MSC_VER #define GST_PLUGIN_EXPORT __declspec(dllexport) extern #ifdef GST_EXPORTS #define GST_EXPORT __declspec(dllexport) extern #define GST_EXPORT __declspec(dllimport) extern #endif -#else /* not WIN32 */ +#else /* not _MSC_VER */ #define GST_PLUGIN_EXPORT #define GST_EXPORT extern Index: gstinfo.h RCS file: /cvs/gstreamer/gstreamer/gst/gstinfo.h,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- gstinfo.h 30 Oct 2006 07:51:13 -0000 1.100 +++ gstinfo.h 5 Jan 2007 13:23:02 -0000 1.101 @@ -321,9 +321,9 @@ * Declares a GstDebugCategory variable as extern. Use in header files. * This macro expands to nothing if debugging is disabled. #define GST_DEBUG_CATEGORY_EXTERN(cat) extern GstDebugCategory *cat #define GST_DEBUG_CATEGORY_EXTERN(cat) \ extern __declspec (dllimport) GstDebugCategory *cat; |