[gjs/wip/ptomato/mozjs31: 8/12] WIP - mozjs31

[Philip Chimento <pchimento src gnome org>]

commit d7d471e22e60720712ddc1492f0d0c756c53b735
Author: Philip Chimento <philip endlessm com>
Date:   Thu Sep 1 18:41:45 2016 -0700

    WIP - mozjs31

 configure.ac     |    2 +-
 gjs/compat.h     |    3 +--
 gjs/jsapi-util.h |    1 +
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2b95534..bb99e6c 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)
diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
index a173235..94f48bd 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -27,6 +27,7 @@
 #include <stdbool.h>
 
 #include <glib-object.h>
+#include <mozilla/Maybe.h>
 
 #include "gjs/compat.h"
 #include "gjs/runtime.h"