gnucash maint: Finish the glib 2.67 fixes for CI tests.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c49b45d8 (commit)
	from  https://github.com/Gnucash/gnucash/commit/e9dfd0d9 (commit)



commit c49b45d8f141691a328f81ae73e54b0f0208faa1
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Mar 22 14:02:37 2021 -0700

    Finish the glib 2.67 fixes for CI tests.

diff --git a/libgnucash/app-utils/test/test-print-parse-amount.cpp b/libgnucash/app-utils/test/test-print-parse-amount.cpp
index ac6b4c27b..8dea72099 100644
--- a/libgnucash/app-utils/test/test-print-parse-amount.cpp
+++ b/libgnucash/app-utils/test/test-print-parse-amount.cpp
@@ -18,6 +18,9 @@
  *                                                                  *
 \********************************************************************/
 
+#include <glib.h>
+#include <glib/gprintf.h>
+
 extern "C"
 {
 #include <config.h>
@@ -30,9 +33,6 @@ extern "C"
 #include <unittest-support.h>
 }
 
-#include <glib.h>
-#include <glib/gprintf.h>
-
 static void
 test_num_print_info (gnc_numeric n, GNCPrintAmountInfo print_info, int line)
 {
diff --git a/libgnucash/app-utils/test/test-scm-query-string.cpp b/libgnucash/app-utils/test/test-scm-query-string.cpp
index 064bdfe98..a31078858 100644
--- a/libgnucash/app-utils/test/test-scm-query-string.cpp
+++ b/libgnucash/app-utils/test/test-scm-query-string.cpp
@@ -22,11 +22,10 @@
 #include <glib.h>
 #include "guile-mappings.h"
 #include <libguile.h>
-#include "gnc-engine-guile.h"
 
 extern "C"
 {
-
+#include "gnc-engine-guile.h"
 #include "gnc-guile-utils.h"
 #include "test-engine-stuff.h"
 #include "test-stuff.h"
diff --git a/libgnucash/backend/xml/test/test-xml2-is-file.cpp b/libgnucash/backend/xml/test/test-xml2-is-file.cpp
index 8b698f45e..82ff4526d 100644
--- a/libgnucash/backend/xml/test/test-xml2-is-file.cpp
+++ b/libgnucash/backend/xml/test/test-xml2-is-file.cpp
@@ -22,10 +22,9 @@ extern "C"
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-
-#include "test-engine-stuff.h"
 }
 
+#include "test-engine-stuff.h"
 #include "io-gncxml-v2.h"
 #include "test-file-stuff.h"
 #include "test-stuff.h"
diff --git a/libgnucash/engine/test-core/test-engine-stuff.h b/libgnucash/engine/test-core/test-engine-stuff.h
index bc661da44..54a47a1a4 100644
--- a/libgnucash/engine/test-core/test-engine-stuff.h
+++ b/libgnucash/engine/test-core/test-engine-stuff.h
@@ -24,11 +24,11 @@
 
 #ifndef TEST_ENGINE_STUFF_H
 #define TEST_ENGINE_STUFF_H
+#include <glib.h>
 #ifdef __cplusplus
 extern "C"
 {
 #endif
-#include <glib.h>
 #include <stdlib.h>
 #include <stdint.h>
 



Summary of changes:
 libgnucash/app-utils/test/test-print-parse-amount.cpp | 6 +++---
 libgnucash/app-utils/test/test-scm-query-string.cpp   | 3 +--
 libgnucash/backend/xml/test/test-xml2-is-file.cpp     | 3 +--
 libgnucash/engine/test-core/test-engine-stuff.h       | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)