From 3aa01070d819daa3ae566814fd2291c941af40ee Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 13 Nov 2010 20:52:11 +0000
Subject: DLL_EXPORT already defined by libtool during configure in mingw
 (-DDLL_EXPORT) -> rename to DECLSPEC_EXPORT

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2737 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 mediaplugin/src/plugins/media/ffmpeg/ffmpeg_plugin.cpp |  2 +-
 .../src/plugins/media/include/core/plugin_core.h       | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'mediaplugin/src/plugins')

diff --git a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_plugin.cpp b/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_plugin.cpp
index 35451388..01f98595 100644
--- a/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_plugin.cpp
+++ b/mediaplugin/src/plugins/media/ffmpeg/ffmpeg_plugin.cpp
@@ -31,7 +31,7 @@
 
 MediaCore_FFmpeg *ffmpegCore;
 
-DLL_EXPORT const pluginInfo_t* PLUGIN_CALL Plugin_register(const pluginCore_t *core) {
+DECLSPEC_EXPORT const pluginInfo_t* PLUGIN_CALL Plugin_register(const pluginCore_t *core) {
 	pluginInitCore(core);
 	return &pluginInfo;
 }
diff --git a/mediaplugin/src/plugins/media/include/core/plugin_core.h b/mediaplugin/src/plugins/media/include/core/plugin_core.h
index e62dd21b..67eca5f7 100644
--- a/mediaplugin/src/plugins/media/include/core/plugin_core.h
+++ b/mediaplugin/src/plugins/media/include/core/plugin_core.h
@@ -36,17 +36,15 @@ extern "C" {
 #endif
 
 /* declaration for export */
-#ifndef DLL_EXPORT
-# if defined(__WIN32__)
-#  define DLL_EXPORT	__declspec(dllexport)
+#if defined(__WIN32__)
+# define DECLSPEC_EXPORT	__declspec(dllexport)
+#else
+# if defined(__GNUC__) && __GNUC__ >= 4
+#  define DECLSPEC_EXPORT	__attribute__ ((visibility("default")))
 # else
-#  if defined(__GNUC__) && __GNUC__ >= 4
-#   define DLL_EXPORT	__attribute__ ((visibility("default")))
-#  else
-#   define DLL_EXPORT
-#  endif
+#  define DECLSPEC_EXPORT
 # endif
-#endif /* DLL_EXPORT */
+#endif
 
 /* use C calling convention */
 #ifndef CDECL
@@ -208,7 +206,7 @@ typedef struct pluginInfo_t {
 
 
 // plugin entry function (must be implemented by the plugin)
-extern DLL_EXPORT const pluginInfo_t* PLUGIN_CALL Plugin_register(const pluginCore_t *core);
+extern DECLSPEC_EXPORT const pluginInfo_t* PLUGIN_CALL Plugin_register(const pluginCore_t *core);
 
 // must be provided by the plugin and initialized on plugin initialization
 extern const pluginCore_t *pluginCore;
-- 
cgit v1.2.3