From c6e43486f81625dcbbe02b03f92d4be47ae5b23e Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Fri, 5 Mar 2010 20:31:51 +0000 Subject: [PATCH] Cutecash: Fix extern "C" usage: Must not enclose system includes, supposedly. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18844 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnc/Session.hpp | 2 +- src/gnc/main.cpp | 6 +++--- src/gnc/mainwindow.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gnc/Session.hpp b/src/gnc/Session.hpp index efed430618..5087c65e95 100644 --- a/src/gnc/Session.hpp +++ b/src/gnc/Session.hpp @@ -25,9 +25,9 @@ // gnucash includes #include "config.h" // required by qof/qofutil.h +#include extern "C" { -#include #include "qof.h" #include "engine/gnc-hooks.h" } diff --git a/src/gnc/main.cpp b/src/gnc/main.cpp index b42e85a57a..91c05793ce 100644 --- a/src/gnc/main.cpp +++ b/src/gnc/main.cpp @@ -23,14 +23,14 @@ */ #include "config.h" -extern "C" -{ #include #include #include #include #include #include +extern "C" +{ #include "gnc-module/gnc-module.h" #include "core-utils/gnc-path.h" #include "core-utils/binreloc.h" @@ -48,12 +48,12 @@ extern "C" #include "backend/xml/gnc-backend-xml.h" #include "business/business-core/gncBusiness.h" #include "business/business-core/xml/gncmod-business-backend-xml.h" +} // END extern C #ifdef HAVE_GETTEXT # include # include #endif -} // END extern C #include #include "mainwindow.hpp" diff --git a/src/gnc/mainwindow.cpp b/src/gnc/mainwindow.cpp index fc20bd42b4..fbc990147b 100644 --- a/src/gnc/mainwindow.cpp +++ b/src/gnc/mainwindow.cpp @@ -31,9 +31,9 @@ #include "ui_mainwindow.h" // gnucash includes +#include extern "C" { -#include #include "qof.h" #include "engine/gnc-hooks.h" #include "core-utils/gnc-filepath-utils.h"