Mercurial > mxe-octave
view src/poppler-no-dll-export.patch @ 2423:1ef908a16c3d
New package: poppler
author | Stefan Löffler <st.loeffler@gmail.com> |
---|---|
date | Tue, 17 Apr 2012 21:07:25 +0200 |
parents | |
children |
line wrap: on
line source
--- a/qt4/src/poppler-export.h 2010-06-24 18:36:48.918858971 +0200 +++ b/qt4/src/poppler-export.h 2010-06-24 18:37:05.658857764 +0200 @@ -2,13 +2,8 @@ * This file is used to set the poppler_qt4_EXPORT macros right. * This is needed for setting the visibility on windows, it will have no effect on other platforms. */ -#if defined(_WIN32) -# define LIB_EXPORT __declspec(dllexport) -# define LIB_IMPORT __declspec(dllimport) -#else # define LIB_EXPORT # define LIB_IMPORT -#endif #ifdef poppler_qt4_EXPORTS # define POPPLER_QT4_EXPORT LIB_EXPORT --- a/cpp/poppler-global.h 2012-04-16 08:02:52.946380873 +0200 +++ b/cpp/poppler-global.h 2012-04-16 08:03:23.882534269 +0200 @@ -20,13 +20,8 @@ #ifndef POPPLER_GLOBAL_H #define POPPLER_GLOBAL_H -#if defined(_WIN32) -# define LIB_EXPORT __declspec(dllexport) -# define LIB_IMPORT __declspec(dllimport) -#else # define LIB_EXPORT # define LIB_IMPORT -#endif #if defined(poppler_cpp_EXPORTS) # define POPPLER_CPP_EXPORT LIB_EXPORT --- a/poppler/XpdfPluginAPI.h 2012-04-16 08:05:16.523092822 +0200 +++ b/poppler/XpdfPluginAPI.h 2012-04-16 08:05:49.019253960 +0200 @@ -28,19 +28,11 @@ */ #define xpdfPluginAPIVersion 1 -#ifdef _WIN32 -# ifdef __cplusplus -# define PLUGINFUNC(retType) extern "C" __declspec(dllexport) retType -# else -# define PLUGINFUNC(retType) extern __declspec(dllexport) retType -# endif -#else # ifdef __cplusplus # define PLUGINFUNC(retType) extern "C" retType # else # define PLUGINFUNC(retType) extern retType # endif -#endif /*------------------------------------------------------------------------ * Plugin setup/cleanup @@ -285,22 +277,12 @@ } XpdfPluginVecTable; -#ifdef _WIN32 - -extern __declspec(dllexport) XpdfPluginVecTable xpdfPluginVecTable; - -#define xpdfPluginSetup \ - extern __declspec(dllexport) \ - XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion}; - -#else extern XpdfPluginVecTable xpdfPluginVecTable; #define xpdfPluginSetup \ XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion}; -#endif #define xpdfGetInfoDict (*xpdfPluginVecTable._xpdfGetInfoDict) #define xpdfGetCatalog (*xpdfPluginVecTable._xpdfGetCatalog)