From 47d2b0a976c8de622bb0da320331498bc90a4242 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vtorri@univ-evry.fr>
Date: Fri, 5 Jan 2007 13:23:02 +0000
Subject: [PATCH] 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.
---
 ChangeLog          | 11 +++++++++++
 gst/gst_private.h  |  4 ++--
 gst/gstconfig.h.in |  4 ++--
 gst/gstinfo.h      |  4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 732389a..6659168 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/gst/gst_private.h b/gst/gst_private.h
index 2b8b4ac..3d778f6 100644
--- a/gst/gst_private.h
+++ b/gst/gst_private.h
@@ -55,9 +55,9 @@ void _priv_gst_registry_cleanup (void);
 
 #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
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index e4aa10f..a465d42 100644
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -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
 #else
 #define GST_EXPORT __declspec(dllimport) extern
 #endif
-#else /* not WIN32 */
+#else /* not _MSC_VER */
 #define GST_PLUGIN_EXPORT
 #define GST_EXPORT extern
 #endif
diff --git a/gst/gstinfo.h b/gst/gstinfo.h
index 57caa6a..3a941b2 100644
--- a/gst/gstinfo.h
+++ b/gst/gstinfo.h
@@ -321,9 +321,9 @@ void            gst_debug_unset_threshold_for_name  (const gchar * name);
  * Declares a GstDebugCategory variable as extern. Use in header files.
  * This macro expands to nothing if debugging is disabled.
  */
-#ifndef WIN32
+#ifndef _MSC_VER
 #define GST_DEBUG_CATEGORY_EXTERN(cat) extern GstDebugCategory *cat
-#else
+#else /* _MSC_VER */
 #define GST_DEBUG_CATEGORY_EXTERN(cat) \
   extern __declspec (dllimport) GstDebugCategory *cat;
 #endif
-- 
2.7.4