diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-03-09 10:30:49 +0000 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-03-09 10:30:49 +0000 |
| commit | 5d2681e102c06e55c31137193d38c5b107220fdd (patch) | |
| tree | a1f03e3adceb7aea4f78a843c59ba203802ad4c0 | |
| parent | a087e75f6738fc9e0815e647153f5f04cc37d3a4 (diff) | |
| parent | bb3baee50c4318229955bcfc35e64acd4f46aa21 (diff) | |
Merge branch 'fix.mingw.warnings.114' into 'cairomm-1-14'
cairommconfig.h.*: Don't dllimport on MinGW (cairomm-1-14 branch)
See merge request cairo/cairomm!15
| -rw-r--r-- | cairommconfig.h.in | 4 | ||||
| -rw-r--r-- | cairommconfig.h.meson | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cairommconfig.h.in b/cairommconfig.h.in index 268e2b9..f55f6d0 100644 --- a/cairommconfig.h.in +++ b/cairommconfig.h.in @@ -23,8 +23,10 @@ #ifdef CAIROMM_DLL # if defined(CAIROMM_BUILD) # define CAIROMM_API __declspec(dllexport) -# else +# elif !defined (__GNUC__) # define CAIROMM_API __declspec(dllimport) +# else /* don't dllimport classes/methods on GCC/MinGW */ +# define CAIROMM_API # endif /* Build a static or non-native-Windows library */ #else diff --git a/cairommconfig.h.meson b/cairommconfig.h.meson index 5a1e7b9..2988edc 100644 --- a/cairommconfig.h.meson +++ b/cairommconfig.h.meson @@ -28,8 +28,10 @@ #ifdef CAIROMM_DLL # if defined(CAIROMM_BUILD) # define CAIROMM_API __declspec(dllexport) -# else +# elif !defined (__GNUC__) # define CAIROMM_API __declspec(dllimport) +# else /* don't dllimport classes/methods on GCC/MinGW */ +# define CAIROMM_API # endif /* Build a static or non-native-Windows library */ #else |