diff options
| author | Ben Murdoch <benm@google.com> | 2009-05-13 17:58:43 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-05-15 11:38:01 +0100 |
| commit | 8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d (patch) | |
| tree | ad83ccc3e517a60955ebedbfc855a4a97558f508 /WebKit/android/jni/WebStorage.cpp | |
| parent | 8fe05189c51b0ae29ba6f8c9d4c86fa288110707 (diff) | |
| download | external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.zip external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.tar.gz external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.tar.bz2 | |
Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk.
Diffstat (limited to 'WebKit/android/jni/WebStorage.cpp')
| -rw-r--r-- | WebKit/android/jni/WebStorage.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebStorage.cpp b/WebKit/android/jni/WebStorage.cpp index d375f3e..f625939 100644 --- a/WebKit/android/jni/WebStorage.cpp +++ b/WebKit/android/jni/WebStorage.cpp @@ -23,8 +23,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <config.h> -#include <wtf/Platform.h> +#include "config.h" + +#if ENABLE(DATABASE) #include <JNIHelp.h> @@ -122,3 +123,6 @@ int register_webstorage(JNIEnv* env) } } + +#endif //ENABLE(DATABASE) + |