[gjs/wip/ptomato/mozjs31: 7/11] WIP - mozjs31
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/mozjs31: 7/11] WIP - mozjs31
- Date: Thu, 20 Oct 2016 21:29:01 +0000 (UTC)
commit b0ee6a27e488b7f1a83d94b35b7ba15ea05d608a
Author: Philip Chimento <philip endlessm com>
Date: Thu Sep 1 18:41:45 2016 -0700
WIP - mozjs31
configure.ac | 2 +-
gjs/compat.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index be70e53..cdbc209 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ m4_define(glib_required_version, 2.50.0)
GOBJECT_INTROSPECTION_REQUIRE([1.41.4])
GOBJECT_REQUIREMENT="gobject-2.0 >= glib_required_version"
-common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-24"
+common_packages="gthread-2.0 gio-2.0 >= glib_required_version mozjs-31"
gjs_packages="gobject-introspection-1.0 libffi $common_packages"
gjs_cairo_packages="cairo cairo-gobject $common_packages"
gjs_gdbus_packages="$GOBJECT_REQUIREMENT gio-2.0"
diff --git a/gjs/compat.h b/gjs/compat.h
index 329f259..3acab39 100644
--- a/gjs/compat.h
+++ b/gjs/compat.h
@@ -27,7 +27,7 @@
#if defined(__clang__)
_Pragma("clang diagnostic push")
-_Pragma("clang diagnostic ignored \"-Wuninitialized\"")
+_Pragma("clang diagnostic ignored \"-Wmismatched-tags\"")
_Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"")
#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
_Pragma("GCC diagnostic push")
@@ -35,7 +35,6 @@ _Pragma("GCC diagnostic ignored \"-Wstrict-prototypes\"")
_Pragma("GCC diagnostic ignored \"-Winvalid-offsetof\"")
#endif
#include <jsapi.h>
-#include <jsdbgapi.h> // Needed by some bits
#if defined(__clang__)
_Pragma("clang diagnostic pop")
#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]