mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
gst/: On win32, all the __declspec stuff for symbol exporting is apparently only needed with MSVC, but doesn't work w...
Original commit message from CVS: 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.
This commit is contained in:
parent
c84a427f7b
commit
47d2b0a976
4 changed files with 17 additions and 6 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
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>
|
2007-01-05 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
* libs/gst/base/gstbasesrc.c: (gst_base_src_activate_push):
|
* libs/gst/base/gstbasesrc.c: (gst_base_src_activate_push):
|
||||||
|
|
|
@ -55,9 +55,9 @@ void _priv_gst_registry_cleanup (void);
|
||||||
|
|
||||||
#ifndef GST_DISABLE_GST_DEBUG
|
#ifndef GST_DISABLE_GST_DEBUG
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef _MSC_VER
|
||||||
#define IMPORT_SYMBOL
|
#define IMPORT_SYMBOL
|
||||||
#else
|
#else /* _MSC_VER */
|
||||||
#ifndef LIBGSTREAMER_EXPORTS
|
#ifndef LIBGSTREAMER_EXPORTS
|
||||||
#define IMPORT_SYMBOL __declspec(dllimport)
|
#define IMPORT_SYMBOL __declspec(dllimport)
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -191,14 +191,14 @@
|
||||||
* On Windows, this exports the plugin definition from the DLL.
|
* On Windows, this exports the plugin definition from the DLL.
|
||||||
* On other platforms, this gets defined as a no-op.
|
* 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
|
#define GST_PLUGIN_EXPORT __declspec(dllexport) extern
|
||||||
#ifdef GST_EXPORTS
|
#ifdef GST_EXPORTS
|
||||||
#define GST_EXPORT __declspec(dllexport) extern
|
#define GST_EXPORT __declspec(dllexport) extern
|
||||||
#else
|
#else
|
||||||
#define GST_EXPORT __declspec(dllimport) extern
|
#define GST_EXPORT __declspec(dllimport) extern
|
||||||
#endif
|
#endif
|
||||||
#else /* not WIN32 */
|
#else /* not _MSC_VER */
|
||||||
#define GST_PLUGIN_EXPORT
|
#define GST_PLUGIN_EXPORT
|
||||||
#define GST_EXPORT extern
|
#define GST_EXPORT extern
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -321,9 +321,9 @@ void gst_debug_unset_threshold_for_name (const gchar * name);
|
||||||
* Declares a GstDebugCategory variable as extern. Use in header files.
|
* Declares a GstDebugCategory variable as extern. Use in header files.
|
||||||
* This macro expands to nothing if debugging is disabled.
|
* This macro expands to nothing if debugging is disabled.
|
||||||
*/
|
*/
|
||||||
#ifndef WIN32
|
#ifndef _MSC_VER
|
||||||
#define GST_DEBUG_CATEGORY_EXTERN(cat) extern GstDebugCategory *cat
|
#define GST_DEBUG_CATEGORY_EXTERN(cat) extern GstDebugCategory *cat
|
||||||
#else
|
#else /* _MSC_VER */
|
||||||
#define GST_DEBUG_CATEGORY_EXTERN(cat) \
|
#define GST_DEBUG_CATEGORY_EXTERN(cat) \
|
||||||
extern __declspec (dllimport) GstDebugCategory *cat;
|
extern __declspec (dllimport) GstDebugCategory *cat;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue