[poppler] 2 commits - qt4/src qt5/src

[Pino Toscano]

 qt4/src/poppler-export.h |   15 +++++++++------
 qt5/src/poppler-export.h |   15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit 03674a141a96806e5e1a134dc3dec2ee61b68713
Author: Pino Toscano <pino at kde.org>
Date:   Sun Jan 26 12:43:13 2014 +0100

    qt4/qt5: add GCC visibility export attributes
    
    this does no actual changes to the exported symbols, but can help in
    hiding symbols if the right GCC flags for symbols visibility are
    specified

diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h
index 0e5d0a0..2e2f6ff 100644
--- a/qt4/src/poppler-export.h
+++ b/qt4/src/poppler-export.h
@@ -5,6 +5,9 @@
 #if defined(_WIN32)
 # define _POPPLER_QT4_LIB_EXPORT __declspec(dllexport)
 # define _POPPLER_QT4_LIB_IMPORT __declspec(dllimport)
+#elif defined(__GNUC__)
+# define _POPPLER_QT4_LIB_EXPORT __attribute__((visibility("default")))
+# define _POPPLER_QT4_LIB_IMPORT
 #else
 # define _POPPLER_QT4_LIB_EXPORT
 # define _POPPLER_QT4_LIB_IMPORT
diff --git a/qt5/src/poppler-export.h b/qt5/src/poppler-export.h
index 4df6636..24a4b17 100644
--- a/qt5/src/poppler-export.h
+++ b/qt5/src/poppler-export.h
@@ -5,6 +5,9 @@
 #if defined(_WIN32)
 # define _POPPLER_QT5_LIB_EXPORT __declspec(dllexport)
 # define _POPPLER_QT5_LIB_IMPORT __declspec(dllimport)
+#elif defined(__GNUC__)
+# define _POPPLER_QT5_LIB_EXPORT __attribute__((visibility("default")))
+# define _POPPLER_QT5_LIB_IMPORT
 #else
 # define _POPPLER_QT5_LIB_EXPORT
 # define _POPPLER_QT5_LIB_IMPORT
commit 52b46d05219cf9898ee4adae7c8c2702adb1ba23
Author: Pino Toscano <pino at kde.org>
Date:   Sun Jan 26 12:38:03 2014 +0100

    qt4/qt5: improve naming of internal export/import macros
    
    use something less generic than LIB_EXPORT/LIB_IMPORT

diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h
index 7661fe9..0e5d0a0 100644
--- a/qt4/src/poppler-export.h
+++ b/qt4/src/poppler-export.h
@@ -3,15 +3,15 @@
 * 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)
+# define _POPPLER_QT4_LIB_EXPORT __declspec(dllexport)
+# define _POPPLER_QT4_LIB_IMPORT __declspec(dllimport)
 #else
-# define LIB_EXPORT
-# define LIB_IMPORT
+# define _POPPLER_QT4_LIB_EXPORT
+# define _POPPLER_QT4_LIB_IMPORT
 #endif
 
 #ifdef poppler_qt4_EXPORTS
-# define POPPLER_QT4_EXPORT LIB_EXPORT
+# define POPPLER_QT4_EXPORT _POPPLER_QT4_LIB_EXPORT
 #else
-# define POPPLER_QT4_EXPORT LIB_IMPORT
+# define POPPLER_QT4_EXPORT _POPPLER_QT4_LIB_IMPORT
 #endif
diff --git a/qt5/src/poppler-export.h b/qt5/src/poppler-export.h
index fdce95c..4df6636 100644
--- a/qt5/src/poppler-export.h
+++ b/qt5/src/poppler-export.h
@@ -3,15 +3,15 @@
 * 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)
+# define _POPPLER_QT5_LIB_EXPORT __declspec(dllexport)
+# define _POPPLER_QT5_LIB_IMPORT __declspec(dllimport)
 #else
-# define LIB_EXPORT
-# define LIB_IMPORT
+# define _POPPLER_QT5_LIB_EXPORT
+# define _POPPLER_QT5_LIB_IMPORT
 #endif
 
 #ifdef poppler_qt5_EXPORTS
-# define POPPLER_QT5_EXPORT LIB_EXPORT
+# define POPPLER_QT5_EXPORT _POPPLER_QT5_LIB_EXPORT
 #else
-# define POPPLER_QT5_EXPORT LIB_IMPORT
+# define POPPLER_QT5_EXPORT _POPPLER_QT5_LIB_IMPORT
 #endif