From e1f22095a08f5cdee2abbd23dec4dd154b3d9085 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 9 Feb 2021 16:07:51 +0000
Subject: [PATCH] don't put glib includes inside extern "C" blocks

see https://github.com/libvips/libvips/issues/1987
---
 libvips/include/vips/dispatch.h | 3 ++-
 libvips/include/vips/vips.h     | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libvips/include/vips/dispatch.h b/libvips/include/vips/dispatch.h
index 457c2cd4..c859e78b 100644
--- a/libvips/include/vips/dispatch.h
+++ b/libvips/include/vips/dispatch.h
@@ -33,11 +33,12 @@
 #ifndef IM_DISPATCH_H
 #define IM_DISPATCH_H
 
+#include <glib-object.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /*__cplusplus*/
 
-#include <glib-object.h>
 #include <vips/vips.h>
 #include <vips/util.h>
 
diff --git a/libvips/include/vips/vips.h b/libvips/include/vips/vips.h
index 20d77a43..4c161c43 100644
--- a/libvips/include/vips/vips.h
+++ b/libvips/include/vips/vips.h
@@ -80,10 +80,6 @@
 #ifndef VIPS_VIPS_H
 #define VIPS_VIPS_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /*__cplusplus*/
-
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gmodule.h>
@@ -93,6 +89,10 @@ extern "C" {
  */
 #include <gio/gio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /*__cplusplus*/
+
 /* If we're being parsed by SWIG, remove gcc attributes.
  */
 #ifdef SWIG