Bug 798156 - glib 2.68.0 breaks gnucash

Move all of the #include <glib> to before the extern "C" blocks
so that the include guards will protect against headers inside
the extern "C" block also including glib.h.
This commit is contained in:
John Ralls committed 2021-04-20 11:03:23 -07:00
1 parent 40e005d963
commit bbb4113a5a
49 files changed
+106 -82

No files matched your search

+2 -2
View File
@@ -27,6 +27,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -35,8 +37,6 @@ extern "C"
#include "gncAddress.h"
}
#include <glib.h>
#include <cstdlib>
#include <cstring>
#include <sstream>
+2 -2
View File
@@ -25,6 +25,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL db
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -40,8 +42,6 @@ extern "C"
#endif
}
#include <glib.h>
#include "gnc-sql-connection.hpp"
#include "gnc-sql-backend.hpp"
#include "gnc-sql-object-backend.hpp"
+2 -2
View File
@@ -27,6 +27,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -39,8 +41,6 @@ extern "C"
#include "gncTaxTableP.h"
}
#include <glib.h>
#include "gnc-sql-connection.hpp"
#include "gnc-sql-backend.hpp"
#include "gnc-sql-object-backend.hpp"
+2 -1
View File
@@ -27,6 +27,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -37,7 +39,6 @@ extern "C"
#include "gnc-commodity.h"
#include "gncEmployeeP.h"
}
#include <glib.h>
#include "gnc-sql-connection.hpp"
#include "gnc-sql-backend.hpp"
+2 -1
View File
@@ -27,6 +27,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -39,7 +41,6 @@ extern "C"
#include "gncInvoiceP.h"
#include "gncTaxTableP.h"
}
#include <glib.h>
#include "gnc-sql-connection.hpp"
#include "gnc-sql-backend.hpp"
+2 -1
View File
@@ -27,6 +27,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -36,7 +38,6 @@ extern "C"
#include "gncJobP.h"
}
#include <glib.h>
#include "gnc-sql-connection.hpp"
#include "gnc-sql-backend.hpp"
+2 -1
View File
@@ -25,6 +25,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL db
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -36,7 +38,6 @@ extern "C"
#include "splint-defs.h"
#endif
}
#include <glib.h>
#include "gnc-sql-connection.hpp"
#include "gnc-sql-backend.hpp"
@@ -25,6 +25,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL db
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -37,7 +39,6 @@ extern "C"
#include "splint-defs.h"
#endif
}
#include <glib.h>
#include "gnc-sql-connection.hpp"
#include "gnc-sql-backend.hpp"
@@ -25,6 +25,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL db
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -39,8 +41,6 @@ extern "C"
#endif
}
#include <glib.h>
#include "gnc-sql-connection.hpp"
#include "gnc-sql-backend.hpp"
#include "gnc-sql-object-backend.hpp"
+2 -2
View File
@@ -27,6 +27,8 @@
* This file implements the top-level QofBackend API for saving/
* restoring data to/from an SQL database
*/
#include <glib.h>
extern "C"
{
#include <config.h>
@@ -39,8 +41,6 @@ extern "C"
#include "gncTaxTableP.h"
}
#include <glib.h>
#include "gnc-sql-connection.hpp"
#include "gnc-sql-backend.hpp"
#include "gnc-sql-object-backend.hpp"