r18844 - gnucash/trunk/src/gnc - Cutecash: Fix extern "C" usage: Must not enclose system includes, supposedly.

Christian Stimming cstim at code.gnucash.org
Fri Mar 5 15:31:51 EST 2010


Author: cstim
Date: 2010-03-05 15:31:51 -0500 (Fri, 05 Mar 2010)
New Revision: 18844
Trac: http://svn.gnucash.org/trac/changeset/18844

Modified:
   gnucash/trunk/src/gnc/Session.hpp
   gnucash/trunk/src/gnc/main.cpp
   gnucash/trunk/src/gnc/mainwindow.cpp
Log:
Cutecash: Fix extern "C" usage: Must not enclose system includes, supposedly.

Modified: gnucash/trunk/src/gnc/Session.hpp
===================================================================
--- gnucash/trunk/src/gnc/Session.hpp	2010-03-05 20:31:31 UTC (rev 18843)
+++ gnucash/trunk/src/gnc/Session.hpp	2010-03-05 20:31:51 UTC (rev 18844)
@@ -25,9 +25,9 @@
 
 // gnucash includes
 #include "config.h" // required by qof/qofutil.h
+#include <glib/gi18n.h>
 extern "C"
 {
-#include <glib/gi18n.h>
 #include "qof.h"
 #include "engine/gnc-hooks.h"
 }

Modified: gnucash/trunk/src/gnc/main.cpp
===================================================================
--- gnucash/trunk/src/gnc/main.cpp	2010-03-05 20:31:31 UTC (rev 18843)
+++ gnucash/trunk/src/gnc/main.cpp	2010-03-05 20:31:51 UTC (rev 18844)
@@ -23,14 +23,14 @@
  */
 #include "config.h"
 
-extern "C"
-{
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <libguile.h>
 #include <glib/gi18n.h>
 #include <glib.h>
+extern "C"
+{
 #include "gnc-module/gnc-module.h"
 #include "core-utils/gnc-path.h"
 #include "core-utils/binreloc.h"
@@ -48,12 +48,12 @@
 #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 <libintl.h>
 #  include <locale.h>
 #endif
-} // END extern C
 
 #include <QApplication>
 #include "mainwindow.hpp"

Modified: gnucash/trunk/src/gnc/mainwindow.cpp
===================================================================
--- gnucash/trunk/src/gnc/mainwindow.cpp	2010-03-05 20:31:31 UTC (rev 18843)
+++ gnucash/trunk/src/gnc/mainwindow.cpp	2010-03-05 20:31:51 UTC (rev 18844)
@@ -31,9 +31,9 @@
 #include "ui_mainwindow.h"
 
 // gnucash includes
+#include <glib/gi18n.h>
 extern "C"
 {
-#include <glib/gi18n.h>
 #include "qof.h"
 #include "engine/gnc-hooks.h"
 #include "core-utils/gnc-filepath-utils.h"



More information about the gnucash-changes mailing list