summaryrefslogtreecommitdiffstats
path: root/googleurl
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-10-14 14:40:18 +0100
committerKristian Monsen <kristianm@google.com>2011-10-21 12:31:00 +0100
commit2557749644f9d25af9721533322db19197c49b49 (patch)
treefd8616ea611ced9bc56b91ae8257678d9d228c58 /googleurl
parenta3fef89eb00853adb6524ab3d11c60f754f08b09 (diff)
downloadexternal_chromium-2557749644f9d25af9721533322db19197c49b49.zip
external_chromium-2557749644f9d25af9721533322db19197c49b49.tar.gz
external_chromium-2557749644f9d25af9721533322db19197c49b49.tar.bz2
Part of fix for bug 5455901 Export symbols from net/
Exporting needed symbols for linking libwebcore and libstagefright. Everything here is cherrypicks from upstream, but only taking the definitions we need to satisfy linker errors. One exception is in openssl_private_key_store.h, which because of this uses an android guard. Change-Id: I74a8f2bfd63a83c2c1684ba955fcdf00bcb2666a
Diffstat (limited to 'googleurl')
-rw-r--r--googleurl/src/url_common.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/googleurl/src/url_common.h b/googleurl/src/url_common.h
index 7e7e27a..684555d 100644
--- a/googleurl/src/url_common.h
+++ b/googleurl/src/url_common.h
@@ -34,15 +34,20 @@
#define GURL_IMPLEMENTATION 0
#endif
-#if defined(WIN32) && defined(GURL_DLL)
+#if defined(GURL_DLL)
+#if defined(WIN32)
#if GURL_IMPLEMENTATION
#define GURL_API __declspec(dllexport)
#else
#define GURL_API __declspec(dllimport)
#endif
#else
+// Non-Windows DLLs.
+#define GURL_API __attribute__((visibility("default")))
+#endif
+#else
+// Not a DLL.
#define GURL_API
#endif
#endif // GOOGLEURL_SRC_URL_COMMON_H__
-