19 lines
850 B
Diff
19 lines
850 B
Diff
|
--- qtwebengine/src/3rdparty/chromium/third_party/libjingle/source/talk/base/latebindingsymboltable.cc 2015-02-17 05:58:22.000000000 +0100
|
||
|
|
+++ qtwebengine/src/3rdparty/chromium/third_party/libjingle/source/talk/base/latebindingsymboltable.cc 2015-06-05 01:29:43.582266992 +0200
|
||
|
|
@@ -118,6 +118,7 @@
|
||
|
|
// versions of the same library to not explode.
|
||
|
|
RTLD_NOW|RTLD_LOCAL
|
||
|
|
#ifdef LINUX
|
||
|
|
+#ifdef __GLIBC__
|
||
|
|
// RTLD_DEEPBIND makes symbol dependencies in the
|
||
|
|
// newly-loaded tree prefer to resolve to definitions within
|
||
|
|
// that tree (the default on OS X). This is necessary for
|
||
|
|
@@ -125,6 +126,7 @@
|
||
|
|
// library to not explode.
|
||
|
|
|RTLD_DEEPBIND
|
||
|
|
#endif
|
||
|
|
+#endif
|
||
|
|
); // NOLINT
|
||
|
|
#else
|
||
|
|
#error Not implemented
|