summaryrefslogtreecommitdiffstats
path: root/src/core/api
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-06-01 13:10:26 +0200
committerMichal Klocek <michal.klocek@qt.io>2017-06-01 13:29:29 +0000
commit1906d4df2146319dcdd5ef71ee26aa0a8ff6fb61 (patch)
tree32ba3c246cd746dcf80a8f6c663a5d2e9105a8b6 /src/core/api
parent1ae33370b69d95ba6d934ff31bff91f243ed70a1 (diff)
Fix compilation on clang
Use 'visibilty' attribute instead of 'static' to hide extra symbols - clang compiler does not like it. Task-number: QTBUG-61138 Task-number: QTBUG-60565 Change-Id: Ibf4b469a179ad77b68ad4e54ab541e7276367a44 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/api')
-rw-r--r--src/core/api/qtbug-60565.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/api/qtbug-60565.cpp b/src/core/api/qtbug-60565.cpp
index 21b545cca..be601b7e4 100644
--- a/src/core/api/qtbug-60565.cpp
+++ b/src/core/api/qtbug-60565.cpp
@@ -47,6 +47,7 @@
#endif
#define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn)))
+#define SHIM_HIDDEN __attribute__ ((visibility ("hidden")))
extern "C" {
@@ -87,19 +88,19 @@ static void* __shimCppNewArray(size_t size);
static void __shimCppDelete(void *address);
static void __shimCppDeleteArray(void *address);
-static void* ShimCppNew(size_t size) {
+SHIM_HIDDEN void* ShimCppNew(size_t size) {
return __shimCppNew(size);
}
-static void* ShimCppNewArray(size_t size) {
+SHIM_HIDDEN void* ShimCppNewArray(size_t size) {
return __shimCppNewArray(size);
}
-static void ShimCppDelete(void* address) {
+SHIM_HIDDEN void ShimCppDelete(void* address) {
__shimCppDelete(address);
}
-static void ShimCppDeleteArray(void* address) {
+SHIM_HIDDEN void ShimCppDeleteArray(void* address) {
__shimCppDeleteArray(address);
}
} // extern "C"