GNOME.org
 

[gjs/wip/ptomato/warnings: 1/10] build: Make a jsapi.h "system header" wrapper

commit 36cce624df431a45eb638fd0a4c24dfecad79380
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Oct 20 22:15:29 2016 -0700

    build: Make a jsapi.h "system header" wrapper
    
    We got rid of all the "compat" stuff in compat.h already, before this
    commit it only included jsapi.h, jsdbgapi.h, and jsapi-util.h, wrapping
    the former two in some diagnostic pragmas. If we get rid of the
    jsapi-util.h include, then we can use a system_header pragma to mark it
    as a system header so that we don't have to painstakingly maintain all
    those diagnostic pragmas.
    
    (The system_header pragma ignores all warnings coming from that file:
    https://gcc.gnu.org/onlinedocs/cpp/System-Headers.html)
    
    Since compat.h already wasn't a fitting name anymore, rename the header
    to jsapi-wrapper.h.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=773297

 Makefile.am                       |    2 +-
 gi/arg.cpp                        |    3 +--
 gi/boxed.cpp                      |    2 +-
 gi/closure.cpp                    |    2 +-
 gi/enumeration.cpp                |    2 +-
 gi/foreign.cpp                    |    2 +-
 gi/function.cpp                   |    2 +-
 gi/fundamental.cpp                |    2 +-
 gi/gerror.cpp                     |    2 +-
 gi/gtype.cpp                      |    3 +--
 gi/interface.cpp                  |    2 +-
 gi/keep-alive.cpp                 |    2 +-
 gi/ns.cpp                         |    2 +-
 gi/object.cpp                     |    2 +-
 gi/param.cpp                      |    2 +-
 gi/repo.cpp                       |    3 +--
 gi/repo.h                         |    2 +-
 gi/union.cpp                      |    2 +-
 gi/value.cpp                      |    2 +-
 gjs/byteArray.cpp                 |    2 +-
 gjs/context-private.h             |    1 -
 gjs/context.cpp                   |    2 +-
 gjs/gi.cpp                        |    2 +-
 gjs/importer.cpp                  |    2 +-
 gjs/jsapi-dynamic-class.cpp       |    2 +-
 gjs/jsapi-private.cpp             |    2 +-
 gjs/jsapi-util-args.h             |    3 ++-
 gjs/jsapi-util-error.cpp          |    2 +-
 gjs/jsapi-util-string.cpp         |    2 +-
 gjs/jsapi-util.cpp                |    2 +-
 gjs/jsapi-util.h                  |    2 +-
 gjs/{compat.h => jsapi-wrapper.h} |   23 +++++------------------
 gjs/mem.cpp                       |    1 -
 gjs/native.cpp                    |    2 +-
 gjs/runtime.cpp                   |    3 ++-
 gjs/stack.cpp                     |    2 +-
 modules/cairo-context.cpp         |    2 +-
 modules/cairo-gradient.cpp        |    2 +-
 modules/cairo-image-surface.cpp   |    3 ++-
 modules/cairo-linear-gradient.cpp |    2 +-
 modules/cairo-path.cpp            |    3 ++-
 modules/cairo-pattern.cpp         |    3 ++-
 modules/cairo-pdf-surface.cpp     |    2 +-
 modules/cairo-ps-surface.cpp      |    2 +-
 modules/cairo-radial-gradient.cpp |    2 +-
 modules/cairo-region.cpp          |    2 +-
 modules/cairo-solid-pattern.cpp   |    2 +-
 modules/cairo-surface-pattern.cpp |    2 +-
 modules/cairo-surface.cpp         |    2 +-
 modules/cairo-svg-surface.cpp     |    2 +-
 modules/cairo.cpp                 |    3 ++-
 modules/console.cpp               |    2 +-
 test/gjs-test-call-args.cpp       |    2 +-
 test/gjs-test-utils.cpp           |    3 ++-
 test/gjs-tests.cpp                |    4 ++--
 55 files changed, 65 insertions(+), 76 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 551b2bf..8a5e8c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,11 +145,11 @@ libgjs_la_SOURCES += $(libgjs_private_source_files)
 
 # These used to be public headers for external modules
 libgjs_la_SOURCES +=           \
-       gjs/compat.h            \
        gjs/coverage.h          \
        gjs/byteArray.h         \
        gjs/importer.h          \
        gjs/jsapi-util.h        \
+       gjs/jsapi-wrapper.h     \
        gjs/runtime.h           \
        gjs/type-module.h       \
        gjs/mem.h               \
diff --git a/gi/arg.cpp b/gi/arg.cpp
index 5098153..90f64b6 100644
--- a/gi/arg.cpp
+++ b/gi/arg.cpp
@@ -35,8 +35,7 @@
 #include "value.h"
 #include "gerror.h"
 #include "gjs/byteArray.h"
-#include "gjs/compat.h"
-
+#include "gjs/jsapi-wrapper.h"
 #include <util/log.h>
 
 bool
diff --git a/gi/boxed.cpp b/gi/boxed.cpp
index fb83128..a686e00 100644
--- a/gi/boxed.cpp
+++ b/gi/boxed.cpp
@@ -28,7 +28,7 @@
 #include "boxed.h"
 #include "arg.h"
 #include "object.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/mem.h"
 #include "repo.h"
 #include "proxyutils.h"
diff --git a/gi/closure.cpp b/gi/closure.cpp
index 0457780..babd6ac 100644
--- a/gi/closure.cpp
+++ b/gi/closure.cpp
@@ -28,7 +28,7 @@
 #include <util/log.h>
 
 #include "closure.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/mem.h"
 #include "keep-alive.h"
 
diff --git a/gi/enumeration.cpp b/gi/enumeration.cpp
index ab05128..2a68e62 100644
--- a/gi/enumeration.cpp
+++ b/gi/enumeration.cpp
@@ -25,7 +25,7 @@
 
 #include <string.h>
 
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "repo.h"
 #include "gtype.h"
 #include "function.h"
diff --git a/gi/foreign.cpp b/gi/foreign.cpp
index db934e1..b675c47 100644
--- a/gi/foreign.cpp
+++ b/gi/foreign.cpp
@@ -28,7 +28,7 @@
 
 #include "arg.h"
 #include "foreign.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 
 static struct {
     char *gi_namespace;
diff --git a/gi/function.cpp b/gi/function.cpp
index 020fbcd..ce542d2 100644
--- a/gi/function.cpp
+++ b/gi/function.cpp
@@ -33,8 +33,8 @@
 #include "closure.h"
 #include "gtype.h"
 #include "param.h"
-#include "gjs/compat.h"
 #include "gjs/jsapi-private.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/mem.h"
 
 #include <util/log.h>
diff --git a/gi/fundamental.cpp b/gi/fundamental.cpp
index 22c7454..13f896a 100644
--- a/gi/fundamental.cpp
+++ b/gi/fundamental.cpp
@@ -33,7 +33,7 @@
 #include "gtype.h"
 #include "proxyutils.h"
 #include "repo.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/mem.h"
 
 #include <gjs/context.h>
diff --git a/gi/gerror.cpp b/gi/gerror.cpp
index b1c0136..a78a70f 100644
--- a/gi/gerror.cpp
+++ b/gi/gerror.cpp
@@ -27,7 +27,7 @@
 
 #include "boxed.h"
 #include "enumeration.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/mem.h"
 #include "repo.h"
 #include "gerror.h"
diff --git a/gi/gtype.cpp b/gi/gtype.cpp
index 84ff1c7..f4ff1cc 100644
--- a/gi/gtype.cpp
+++ b/gi/gtype.cpp
@@ -25,8 +25,7 @@
 #include <config.h>
 
 #include "gtype.h"
-
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include <util/log.h>
 #include <girepository.h>
 
diff --git a/gi/interface.cpp b/gi/interface.cpp
index d06199a..77c2b60 100644
--- a/gi/interface.cpp
+++ b/gi/interface.cpp
@@ -28,7 +28,7 @@
 #include "gtype.h"
 #include "interface.h"
 #include "repo.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/mem.h"
 
 #include <util/log.h>
diff --git a/gi/keep-alive.cpp b/gi/keep-alive.cpp
index 396741e..0464a98 100644
--- a/gi/keep-alive.cpp
+++ b/gi/keep-alive.cpp
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "keep-alive.h"
 
 #include <util/log.h>
diff --git a/gi/ns.cpp b/gi/ns.cpp
index 33335ba..6126b09 100644
--- a/gi/ns.cpp
+++ b/gi/ns.cpp
@@ -26,7 +26,7 @@
 #include "ns.h"
 #include "repo.h"
 #include "param.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/mem.h"
 
 #include <util/log.h>
diff --git a/gi/object.cpp b/gi/object.cpp
index f43cc0b..004a164 100644
--- a/gi/object.cpp
+++ b/gi/object.cpp
@@ -41,7 +41,7 @@
 #include "keep-alive.h"
 #include "closure.h"
 #include "gjs_gi_trace.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/context-private.h"
 #include "gjs/mem.h"
 #include "gjs/type-module.h"
diff --git a/gi/param.cpp b/gi/param.cpp
index a35c5f5..42ab967 100644
--- a/gi/param.cpp
+++ b/gi/param.cpp
@@ -31,7 +31,7 @@
 #include "repo.h"
 #include "gtype.h"
 #include "function.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/mem.h"
 
 #include <util/log.h>
diff --git a/gi/repo.cpp b/gi/repo.cpp
index 1b60039..96c40a0 100644
--- a/gi/repo.cpp
+++ b/gi/repo.cpp
@@ -36,8 +36,7 @@
 #include "fundamental.h"
 #include "interface.h"
 #include "gerror.h"
-
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/jsapi-private.h"
 #include "gjs/mem.h"
 
diff --git a/gi/repo.h b/gi/repo.h
index 867b8c1..4bd4720 100644
--- a/gi/repo.h
+++ b/gi/repo.h
@@ -29,7 +29,7 @@
 
 #include <girepository.h>
 
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include <util/log.h>
 
 G_BEGIN_DECLS
diff --git a/gi/union.cpp b/gi/union.cpp
index a494622..1a2c072 100644
--- a/gi/union.cpp
+++ b/gi/union.cpp
@@ -31,7 +31,7 @@
 #include "union.h"
 #include "arg.h"
 #include "object.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs/mem.h"
 #include "repo.h"
 #include "proxyutils.h"
diff --git a/gi/value.cpp b/gi/value.cpp
index 71dbf16..c2114c7 100644
--- a/gi/value.cpp
+++ b/gi/value.cpp
@@ -36,7 +36,7 @@
 #include "union.h"
 #include "gtype.h"
 #include "gerror.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 
 #include <girepository.h>
 
diff --git a/gjs/byteArray.cpp b/gjs/byteArray.cpp
index b9de83d..26d824a 100644
--- a/gjs/byteArray.cpp
+++ b/gjs/byteArray.cpp
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include "byteArray.h"
 #include "gi/boxed.h"
-#include "compat.h"
+#include "jsapi-wrapper.h"
 #include "jsapi-util-args.h"
 #include <girepository.h>
 #include <util/log.h>
diff --git a/gjs/context-private.h b/gjs/context-private.h
index 98adddb..10d000a 100644
--- a/gjs/context-private.h
+++ b/gjs/context-private.h
@@ -25,7 +25,6 @@
 #define __GJS_CONTEXT_PRIVATE_H__
 
 #include "context.h"
-#include "compat.h"
 
 G_BEGIN_DECLS
 
diff --git a/gjs/context.cpp b/gjs/context.cpp
index ff39cd1..f1acfd1 100644
--- a/gjs/context.cpp
+++ b/gjs/context.cpp
@@ -29,9 +29,9 @@
 #include "importer.h"
 #include "jsapi-private.h"
 #include "jsapi-util.h"
+#include "jsapi-wrapper.h"
 #include "native.h"
 #include "byteArray.h"
-#include "compat.h"
 #include "runtime.h"
 
 #include "gi.h"
diff --git a/gjs/gi.cpp b/gjs/gi.cpp
index a960f01..8685ffd 100644
--- a/gjs/gi.cpp
+++ b/gjs/gi.cpp
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "gjs/native.h"
-#include "gjs/compat.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gi/repo.h"
 
 bool
diff --git a/gjs/importer.cpp b/gjs/importer.cpp
index 1b8d72c..dff706e 100644
--- a/gjs/importer.cpp
+++ b/gjs/importer.cpp
@@ -26,8 +26,8 @@
 #include <util/log.h>
 #include <util/glib.h>
 
-#include "compat.h"
 #include "importer.h"
+#include "jsapi-wrapper.h"
 #include "mem.h"
 #include "native.h"
 
diff --git a/gjs/jsapi-dynamic-class.cpp b/gjs/jsapi-dynamic-class.cpp
index 2581b2a..954f507 100644
--- a/gjs/jsapi-dynamic-class.cpp
+++ b/gjs/jsapi-dynamic-class.cpp
@@ -29,7 +29,7 @@
 #include <util/misc.h>
 
 #include "jsapi-util.h"
-#include "compat.h"
+#include "jsapi-wrapper.h"
 #include "jsapi-private.h"
 
 #include <string.h>
diff --git a/gjs/jsapi-private.cpp b/gjs/jsapi-private.cpp
index d7713f6..6469c82 100644
--- a/gjs/jsapi-private.cpp
+++ b/gjs/jsapi-private.cpp
@@ -29,7 +29,7 @@
 
 #include "jsapi-util.h"
 #include "jsapi-private.h"
-#include "compat.h"
+#include "jsapi-wrapper.h"
 
 #include <string.h>
 #pragma GCC diagnostic push
diff --git a/gjs/jsapi-util-args.h b/gjs/jsapi-util-args.h
index a3bad22..87f7901 100644
--- a/gjs/jsapi-util-args.h
+++ b/gjs/jsapi-util-args.h
@@ -27,7 +27,8 @@
 
 #include <glib.h>
 
-#include "compat.h"
+#include "jsapi-util.h"
+#include "jsapi-wrapper.h"
 
 static inline bool
 check_nullable(const char*& fchar,
diff --git a/gjs/jsapi-util-error.cpp b/gjs/jsapi-util-error.cpp
index 8888b9b..66a819a 100644
--- a/gjs/jsapi-util-error.cpp
+++ b/gjs/jsapi-util-error.cpp
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "jsapi-util.h"
-#include "compat.h"
+#include "jsapi-wrapper.h"
 #include "gi/gerror.h"
 
 #include <util/log.h>
diff --git a/gjs/jsapi-util-string.cpp b/gjs/jsapi-util-string.cpp
index ebec900..0b275a6 100644
--- a/gjs/jsapi-util-string.cpp
+++ b/gjs/jsapi-util-string.cpp
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "jsapi-util.h"
-#include "compat.h"
+#include "jsapi-wrapper.h"
 
 JSBool
 gjs_string_to_utf8 (JSContext      *context,
diff --git a/gjs/jsapi-util.cpp b/gjs/jsapi-util.cpp
index 8f39ea7..35ffbdc 100644
--- a/gjs/jsapi-util.cpp
+++ b/gjs/jsapi-util.cpp
@@ -30,7 +30,7 @@
 #include <util/error.h>
 
 #include "jsapi-util.h"
-#include "compat.h"
+#include "jsapi-wrapper.h"
 #include "context-private.h"
 #include "jsapi-private.h"
 #include <gi/boxed.h>
diff --git a/gjs/jsapi-util.h b/gjs/jsapi-util.h
index 5e24093..3cde84e 100644
--- a/gjs/jsapi-util.h
+++ b/gjs/jsapi-util.h
@@ -28,7 +28,7 @@
 
 #include <glib-object.h>
 
-#include "gjs/compat.h"
+#include "jsapi-wrapper.h"
 #include "gjs/runtime.h"
 #include "gi/gtype.h"
 
diff --git a/gjs/compat.h b/gjs/jsapi-wrapper.h
similarity index 66%
rename from gjs/compat.h
rename to gjs/jsapi-wrapper.h
index 329f259..78e1dea 100644
--- a/gjs/compat.h
+++ b/gjs/jsapi-wrapper.h
@@ -22,26 +22,13 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef __GJS_COMPAT_H__
-#define __GJS_COMPAT_H__
+#ifndef GJS_JSAPI_WRAPPER_H
+#define GJS_JSAPI_WRAPPER_H
 
-#if defined(__clang__)
-_Pragma("clang diagnostic push")
-_Pragma("clang diagnostic ignored \"-Wuninitialized\"")
-_Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"")
-#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wstrict-prototypes\"")
-_Pragma("GCC diagnostic ignored \"-Winvalid-offsetof\"")
+#if defined(__clang__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+_Pragma("GCC system_header")
 #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)
-_Pragma("GCC diagnostic pop")
-#endif
-
-#include "jsapi-util.h"
 
-#endif  /* __GJS_COMPAT_H__ */
+#endif  /* GJS_JSAPI_WRAPPER_H */
diff --git a/gjs/mem.cpp b/gjs/mem.cpp
index 73f7312..1e562d3 100644
--- a/gjs/mem.cpp
+++ b/gjs/mem.cpp
@@ -24,7 +24,6 @@
 #include <config.h>
 
 #include "mem.h"
-#include "compat.h"
 #include <util/log.h>
 
 #define GJS_DEFINE_COUNTER(name)             \
diff --git a/gjs/native.cpp b/gjs/native.cpp
index 52adbc0..caa7c6f 100644
--- a/gjs/native.cpp
+++ b/gjs/native.cpp
@@ -28,7 +28,7 @@
 #include <util/log.h>
 
 #include "native.h"
-#include "compat.h"
+#include "jsapi-wrapper.h"
 #include "jsapi-util.h"
 
 static GHashTable *modules = NULL;
diff --git a/gjs/runtime.cpp b/gjs/runtime.cpp
index 97c7804..cfc52e3 100644
--- a/gjs/runtime.cpp
+++ b/gjs/runtime.cpp
@@ -23,7 +23,8 @@
 
 #include <config.h>
 
-#include "compat.h"
+#include "jsapi-util.h"
+#include "jsapi-wrapper.h"
 #include "runtime.h"
 
 struct RuntimeData {
diff --git a/gjs/stack.cpp b/gjs/stack.cpp
index 9f2b3f5..971e0f3 100644
--- a/gjs/stack.cpp
+++ b/gjs/stack.cpp
@@ -44,8 +44,8 @@
 #include <glib.h>
 #include <string.h>
 #include "context.h"
-#include "compat.h"
 #include "jsapi-util.h"
+#include "jsapi-wrapper.h"
 
 bool
 gjs_context_get_frame_info (JSContext  *context,
diff --git a/modules/cairo-context.cpp b/modules/cairo-context.cpp
index 0309783..5355352 100644
--- a/modules/cairo-context.cpp
+++ b/modules/cairo-context.cpp
@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gi/foreign.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 
 #include <cairo.h>
 #include <cairo-gobject.h>
diff --git a/modules/cairo-gradient.cpp b/modules/cairo-gradient.cpp
index 7431068..3fd5e14 100644
--- a/modules/cairo-gradient.cpp
+++ b/modules/cairo-gradient.cpp
@@ -22,8 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo-image-surface.cpp b/modules/cairo-image-surface.cpp
index fbaf1b9..c346944 100644
--- a/modules/cairo-image-surface.cpp
+++ b/modules/cairo-image-surface.cpp
@@ -22,8 +22,9 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
+#include "gjs/jsapi-util.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo-linear-gradient.cpp b/modules/cairo-linear-gradient.cpp
index 53e3a02..4b6156d 100644
--- a/modules/cairo-linear-gradient.cpp
+++ b/modules/cairo-linear-gradient.cpp
@@ -22,8 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo-path.cpp b/modules/cairo-path.cpp
index 64b6630..0ec2123 100644
--- a/modules/cairo-path.cpp
+++ b/modules/cairo-path.cpp
@@ -22,7 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
+#include "gjs/jsapi-util.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo-pattern.cpp b/modules/cairo-pattern.cpp
index b29e3af..cab1a09 100644
--- a/modules/cairo-pattern.cpp
+++ b/modules/cairo-pattern.cpp
@@ -22,7 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
+#include "gjs/jsapi-util.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include <cairo-gobject.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-pdf-surface.cpp b/modules/cairo-pdf-surface.cpp
index 0a37f56..e1abdf7 100644
--- a/modules/cairo-pdf-surface.cpp
+++ b/modules/cairo-pdf-surface.cpp
@@ -22,8 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo-ps-surface.cpp b/modules/cairo-ps-surface.cpp
index 71cdd3e..097f248 100644
--- a/modules/cairo-ps-surface.cpp
+++ b/modules/cairo-ps-surface.cpp
@@ -22,8 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo-radial-gradient.cpp b/modules/cairo-radial-gradient.cpp
index 6e4b6d4..8952f59 100644
--- a/modules/cairo-radial-gradient.cpp
+++ b/modules/cairo-radial-gradient.cpp
@@ -22,8 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo-region.cpp b/modules/cairo-region.cpp
index ecee331..921e6e5 100644
--- a/modules/cairo-region.cpp
+++ b/modules/cairo-region.cpp
@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gi/foreign.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 
 #include <cairo.h>
 #include <cairo-gobject.h>
diff --git a/modules/cairo-solid-pattern.cpp b/modules/cairo-solid-pattern.cpp
index f4a3e17..39b2c34 100644
--- a/modules/cairo-solid-pattern.cpp
+++ b/modules/cairo-solid-pattern.cpp
@@ -22,8 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo-surface-pattern.cpp b/modules/cairo-surface-pattern.cpp
index 271cb80..4df6c6a 100644
--- a/modules/cairo-surface-pattern.cpp
+++ b/modules/cairo-surface-pattern.cpp
@@ -22,8 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo-surface.cpp b/modules/cairo-surface.cpp
index e563595..e1a43ed 100644
--- a/modules/cairo-surface.cpp
+++ b/modules/cairo-surface.cpp
@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gi/foreign.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include <cairo-gobject.h>
 #include "cairo-private.h"
diff --git a/modules/cairo-svg-surface.cpp b/modules/cairo-svg-surface.cpp
index e601c70..d2779c3 100644
--- a/modules/cairo-svg-surface.cpp
+++ b/modules/cairo-svg-surface.cpp
@@ -22,8 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include <cairo.h>
 #include "cairo-private.h"
 
diff --git a/modules/cairo.cpp b/modules/cairo.cpp
index 7e4b915..fc1bb38 100644
--- a/modules/cairo.cpp
+++ b/modules/cairo.cpp
@@ -22,7 +22,8 @@
 
 #include <config.h>
 
-#include "gjs/compat.h"
+#include "gjs/jsapi-util.h"
+#include "gjs/jsapi-wrapper.h"
 #include "cairo-private.h"
 
 #if CAIRO_HAS_XLIB_SURFACE
diff --git a/modules/console.cpp b/modules/console.cpp
index 7dde126..f15596c 100644
--- a/modules/console.cpp
+++ b/modules/console.cpp
@@ -53,8 +53,8 @@
 #include <glib/gprintf.h>
 
 #include "console.h"
-#include "gjs/compat.h"
 #include "gjs/jsapi-private.h"
+#include "gjs/jsapi-wrapper.h"
 
 static void
 gjs_console_error_reporter(JSContext *cx, const char *message, JSErrorReport *report)
diff --git a/test/gjs-test-call-args.cpp b/test/gjs-test-call-args.cpp
index cd9dccd..0bfa0e3 100644
--- a/test/gjs-test-call-args.cpp
+++ b/test/gjs-test-call-args.cpp
@@ -2,9 +2,9 @@
 
 #include <glib.h>
 
-#include "gjs/compat.h"
 #include "gjs/context.h"
 #include "gjs/jsapi-util-args.h"
+#include "gjs/jsapi-wrapper.h"
 #include "test/gjs-test-utils.h"
 
 #define assert_match(str, pattern)                                            \
diff --git a/test/gjs-test-utils.cpp b/test/gjs-test-utils.cpp
index 990d86a..1e2ba27 100644
--- a/test/gjs-test-utils.cpp
+++ b/test/gjs-test-utils.cpp
@@ -31,8 +31,9 @@
 
 #include <glib.h>
 
-#include "gjs/compat.h"
 #include "gjs/context.h"
+#include "gjs/jsapi-util.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs-test-utils.h"
 
 static void
diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
index 310e82d..712ba0d 100644
--- a/test/gjs-tests.cpp
+++ b/test/gjs-tests.cpp
@@ -27,8 +27,8 @@
 #include <util/glib.h>
 
 #include <gjs/context.h>
-
-#include "gjs/compat.h"
+#include "gjs/jsapi-util.h"
+#include "gjs/jsapi-wrapper.h"
 #include "gjs-test-utils.h"
 
 static void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]