1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
diff -Naur libharu-2.2.1_pristine/include/hpdf.h libharu-2.2.1/include/hpdf.h
--- libharu-2.2.1_pristine/include/hpdf.h 2010-11-22 01:57:27.000000000 -0800
+++ libharu-2.2.1/include/hpdf.h 2013-10-21 11:35:14.480238924 -0700
@@ -20,34 +20,33 @@
#include "hpdf_config.h"
#include "hpdf_version.h"
-#ifdef HPDF_DLL_MAKE
-# define HPDF_EXPORT(A) __declspec(dllexport) A __stdcall
+#if defined ( hpdf_EXPORTS )
+ #if defined ( HPDF_DLL_MAKE )
+ #define HPDF_EXPORT(A) __declspec(dllexport) A __stdcall
+ #elif defined ( HPDF_DLL_MAKE_CDECL )
+ #define HPDF_EXPORT(A) __declspec(dllexport) A
+ #elif defined ( __GNUC__ ) && __GNUC__ > 3
+ // Follow ideas in http://gcc.gnu.org/wiki/Visibility for GCC version 4.x
+ #define HPDF_EXPORT(A) __attribute__ ((visibility("default"))) A
+ #elif defined ( HPDF_SHARED_MAKE )
+ #define HPDF_EXPORT(A) extern A
+ #else
+ #define HPDF_EXPORT(A) extern A
+ #endif
#else
-# ifdef HPDF_DLL_MAKE_CDECL
-# define HPDF_EXPORT(A) __declspec(dllexport) A
-# else
-# ifdef HPDF_SHARED_MAKE
-# define HPDF_EXPORT(A) extern A
-# endif /* HPDF_SHARED_MAKE */
-# endif /* HPDF_DLL_MAKE_CDECL */
-#endif /* HPDF_DLL_MAKE */
-
-#ifdef HPDF_DLL
-# define HPDF_SHARED
-# define HPDF_EXPORT(A) __declspec(dllimport) A __stdcall
-#else
-# ifdef HPDF_DLL_CDECL
-# define HPDF_SHARED
-# define HPDF_EXPORT(A) __declspec(dllimport) A
-# endif /* HPDF_DLL_CDECL */
-#endif /* HPDF_DLL */
+ #if defined ( HPDF_DLL)
+ #define HPDF_SHARED
+ #define HPDF_EXPORT(A) __declspec(dllimport) A __stdcall
+ #elif defined ( HPDF_DLL_CDECL )
+ #define HPDF_SHARED
+ #define HPDF_EXPORT(A) __declspec(dllimport) A
+ #else
+ #define HPDF_EXPORT(A) extern A
+ #endif
+#endif
#ifdef HPDF_SHARED
-#ifndef HPDF_EXPORT
-#define HPDF_EXPORT(A) extern A
-#endif /* HPDF_EXPORT */
-
#include "hpdf_consts.h"
#include "hpdf_types.h"
@@ -75,10 +74,6 @@
#else
-#ifndef HPDF_EXPORT
-#define HPDF_EXPORT(A) A
-#endif /* HPDF_EXPORT */
-
#include "hpdf_consts.h"
#include "hpdf_doc.h"
#include "hpdf_error.h"
|
