diff options
| author |  mtklein <mtklein@chromium.org> | 2016-07-28 09:45:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-28 09:45:15 -0700 |
| commit | fa84d94bb0b226f81b7eaa411aabbbaec3d180cb (patch) | |
| tree | 10ebfcb2d467ad5d3df92834d1b27cd480f91e9b /include/core/SkPreConfig.h | |
| parent | ba59595ea3b5c4a632ba5a67e47d7ac96d93ee39 (diff) | |
Make both SK_API definition points identical and order independent.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2189983002
Review-Url: https://codereview.chromium.org/2189983002
Diffstat (limited to 'include/core/SkPreConfig.h')
| -rw-r--r-- | include/core/SkPreConfig.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 8c8eeef246..f993920fda 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -209,18 +209,20 @@ #define SKIA_IMPLEMENTATION 0 #endif -#if defined(SKIA_DLL) - #if defined(SK_BUILD_FOR_WIN32) - #if SKIA_IMPLEMENTATION - #define SK_API __declspec(dllexport) +#if !defined(SK_API) + #if defined(SKIA_DLL) + #if defined(SK_BUILD_FOR_WIN32) + #if SKIA_IMPLEMENTATION + #define SK_API __declspec(dllexport) + #else + #define SK_API __declspec(dllimport) + #endif #else - #define SK_API __declspec(dllimport) + #define SK_API __attribute__((visibility("default"))) #endif #else - #define SK_API __attribute__((visibility("default"))) + #define SK_API #endif -#else - #define SK_API #endif ////////////////////////////////////////////////////////////////////// |