summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2010-11-22 17:32:22 -0800
committerRussell Brenner <russellbrenner@google.com>2010-12-02 13:47:21 -0800
commit1c7e3f51abb8590ac714e6ceeb9a5931365053ea (patch)
tree6ef62fdc38464234f696eca2e73895a8186c882a
parent9f8811ec084be6ba9380c41abf6e2a080b6d9b91 (diff)
downloadexternal_webkit-1c7e3f51abb8590ac714e6ceeb9a5931365053ea.zip
external_webkit-1c7e3f51abb8590ac714e6ceeb9a5931365053ea.tar.gz
external_webkit-1c7e3f51abb8590ac714e6ceeb9a5931365053ea.tar.bz2
Merge WebKit at r72274: Moved definition of EXPORT
The definition of EXPORT was removed from WebCorePrefix.h, citing that it's only needed by WebKit/android. Added definition to WebKit/android. http://trac.webkit.org/changeset/71578 Change-Id: I3fe6909d5e5c668299ca25dc39ef0e444620fd33
-rw-r--r--WebKit/android/jni/WebCoreJniOnLoad.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp
index 6790e42..33afb02 100644
--- a/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -69,6 +69,8 @@
#include <jni.h>
#include <utils/Log.h>
+#define EXPORT __attribute__((visibility("default")))
+
namespace android {
extern int registerWebFrame(JNIEnv*);