aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-04-26 20:04:16 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-04-26 20:04:16 +0000
commitc0091114461339c7e6a78a0f1669cecad1e22146 (patch)
tree4a7f3b60e674e7ec98ecc6d5c1647ca8408d43e8
parent69731aa60cb06bcdc06ca281565d866fee74ffab (diff)
update SK_API for non-windows builds git-svn-id: http://skia.googlecode.com/svn/trunk@1192 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--include/core/SkPreConfig.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h
index daf2041b4f..2d6b7aea90 100644
--- a/include/core/SkPreConfig.h
+++ b/include/core/SkPreConfig.h
@@ -101,12 +101,16 @@
#if !defined(SKIA_IMPLEMENTATION)
#define SKIA_IMPLEMENTATION 0
#endif
-
-#if defined(WIN32) && defined(SKIA_DLL)
- #if SKIA_IMPLEMENTATION
- #define SK_API __declspec(dllexport)
+
+#if defined(SKIA_DLL)
+ #if defined(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