From 4ee5763075e62b26f1a0c136dd7f3221145f86e6 Mon Sep 17 00:00:00 2001 From: Rob Gowin Date: Mon, 30 Nov 2015 12:38:42 -0600 Subject: [PATCH] Fix build issues src/backend/sql/gnc-transaction-sql.cpp: Move inclusion of escape.h out of extern "C" block since escape.h is now C++ code. src/backend/xml/gnc-backend-xml.cpp: Move inclusion of gnc-pref.s out of extern "C" block since gnc-pref.c is still plain C code. --- src/backend/sql/gnc-transaction-sql.cpp | 4 ++-- src/backend/xml/gnc-backend-xml.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/sql/gnc-transaction-sql.cpp b/src/backend/sql/gnc-transaction-sql.cpp index f20bfa4ffa..baf6c0c62c 100644 --- a/src/backend/sql/gnc-transaction-sql.cpp +++ b/src/backend/sql/gnc-transaction-sql.cpp @@ -42,13 +42,13 @@ extern "C" #include "gnc-commodity.h" #include "gnc-engine.h" -#include "escape.h" - #ifdef S_SPLINT_S #include "splint-defs.h" #endif } +#include "escape.h" + #include "gnc-backend-sql.h" #include "gnc-transaction-sql.h" #include "gnc-commodity-sql.h" diff --git a/src/backend/xml/gnc-backend-xml.cpp b/src/backend/xml/gnc-backend-xml.cpp index dd0f157c6d..4d53d33e9f 100644 --- a/src/backend/xml/gnc-backend-xml.cpp +++ b/src/backend/xml/gnc-backend-xml.cpp @@ -79,6 +79,7 @@ typedef int ssize_t; #include "gnc-uri-utils.h" #include "io-gncxml-v2.h" #include "gnc-backend-xml.h" +#include "gnc-prefs.h" #ifndef HAVE_STRPTIME # include "strptime.h" @@ -87,7 +88,6 @@ typedef int ssize_t; #include "gnc-xml-helper.h" #include "io-gncxml.h" -#include "gnc-prefs.h" #include "gnc-address-xml-v2.h" #include "gnc-bill-term-xml-v2.h"