diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-03-09 10:31:24 +0000 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-03-09 10:31:24 +0000 |
| commit | 4fe97af983213de24cb53cae9abd75458d57d088 (patch) | |
| tree | a6c70854f3b9cda94a7ace88f20fc60792b72b79 | |
| parent | da328a5099950600c51f9e2185c689b8793d9650 (diff) | |
| parent | e828ba65061d6d4dd49873b7fef7383135aa4193 (diff) | |
Merge branch 'fix.mingw.warnings' into 'master'
cairommconfig.h.*: Don't dllimport on MinGW (master branch)
See merge request cairo/cairomm!16
| -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 f01a2e9..5b186ee 100644 --- a/cairommconfig.h.in +++ b/cairommconfig.h.in @@ -22,8 +22,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 |