IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[c++options] Reorder include directives to fix Windows biuld.

Browse Source 
libguile.h includes windows.h and doing so breaks including c++ headers
after that use advanced features like enum class. Ensure that the
gnc-option headers are included before libguile.h.
This commit is contained in:
John Ralls 2023-01-08 16:04:27 -08:00
parent de847278d6
commit f96f8f4043
12 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnucash/gnome-utils/dialog-options.cpp
View File

@ -29,10 +29,13 @@ extern "C"
} }
#include <Account.h> // To include as C++ overriding later indirect includes #include <Account.h> // To include as C++ overriding later indirect includes
#include <libguile.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gnc-optiondb.hpp>
#include <gnc-optiondb-impl.hpp>
#include "dialog-options.hpp"
#include <libguile.h>
extern "C" extern "C"
{ {
@ -48,10 +51,7 @@ extern "C"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include "dialog-options.hpp"
#include "gnc-option-gtk-ui.hpp" #include "gnc-option-gtk-ui.hpp"
#include <gnc-optiondb.hpp>
#include <gnc-optiondb-impl.hpp>
#define GNC_PREF_CLOCK_24H "clock-24h" #define GNC_PREF_CLOCK_24H "clock-24h"

2
gnucash/gnome-utils/dialog-options.hpp
View File

@ -34,6 +34,8 @@
#include "gnc-option-uitype.hpp" #include "gnc-option-uitype.hpp"
#include <gnc-option-ui.hpp> #include <gnc-option-ui.hpp>
#include <gnc-optiondb.hpp>
#include <gtk/gtk.h>
class GncOptionsDialog; class GncOptionsDialog;

4
gnucash/gnome-utils/gnc-main-window.cpp
View File

@ -32,11 +32,12 @@
@author Copyright (C) 2003 Jan Arne Petersen <jpetersen@uni-bonn.de> @author Copyright (C) 2003 Jan Arne Petersen <jpetersen@uni-bonn.de>
@author Copyright (C) 2003,2005,2006 David Hampton <hampton@employees.org> @author Copyright (C) 2003,2005,2006 David Hampton <hampton@employees.org>
*/ */
#include <libguile.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "dialog-options.hpp"
#include <libguile.h>
extern "C" extern "C"
{ {
@ -88,7 +89,6 @@ extern "C"
# include <sys/stat.h> // for stat(2) # include <sys/stat.h> // for stat(2)
#endif #endif
} }
#include "dialog-options.hpp"
/** Names of signals generated by the main window. */ /** Names of signals generated by the main window. */
enum enum

10
gnucash/gnome-utils/gnc-option-gtk-ui.cpp
View File

@ -20,9 +20,9 @@
* Boston, MA 02110-1301, USA gnu@gnu.org * * Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/ \********************************************************************/
#include "gnc-option-gtk-ui.hpp"
#include <gnc-option.hpp> #include <gnc-option.hpp>
#include <gnc-option-impl.hpp> #include <gnc-option-impl.hpp>
#include "gnc-option-gtk-ui.hpp"
extern "C" extern "C"
{ {
#include <config.h> // for scanf format string #include <config.h> // for scanf format string
@ -39,6 +39,14 @@ extern "C"
#include "gnc-tree-model-budget.h" // for gnc_tree_model_budget #include "gnc-tree-model-budget.h" // for gnc_tree_model_budget
#include "misc-gnome-utils.h" // for xxxgtk_textview_set_text #include "misc-gnome-utils.h" // for xxxgtk_textview_set_text
} }
/*Something somewhere in windows.h defines ABSOLUTE to something and
*that contaminates using it in RelativeDateType. Undef it.
*/
#ifdef ABSOLUTE
#undef ABSOLUTE
#endif
/* This static indicates the debugging module that this .o belongs to. */ /* This static indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = GNC_MOD_GUI; static QofLogModule log_module = GNC_MOD_GUI;

2
gnucash/gnome-utils/gnc-option-gtk-ui.hpp
View File

@ -23,13 +23,13 @@
#ifndef GNC_OPTION_GTK_UI_HPP #ifndef GNC_OPTION_GTK_UI_HPP
#define GNC_OPTION_GTK_UI_HPP #define GNC_OPTION_GTK_UI_HPP
#include <libguile.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <vector> #include <vector>
#include <gnc-option.hpp> #include <gnc-option.hpp>
#include <gnc-option-uitype.hpp> #include <gnc-option-uitype.hpp>
#include <gnc-option-ui.hpp> #include <gnc-option-ui.hpp>
#include <libguile.h>
/** @fn WidgetCreateFunc /** @fn WidgetCreateFunc
* Function pointer for per-option-type GtkWidget constructors. * Function pointer for per-option-type GtkWidget constructors.

6
gnucash/gnome/assistant-hierarchy.cpp
View File

@ -22,10 +22,12 @@
* Boston, MA 02110-1301, USA gnu@gnu.org * * Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/ \********************************************************************/
#include <libguile.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <dialog-options.hpp>
#include <gnc-optiondb.h>
#include <libguile.h>
extern "C" extern "C"
{ {
@ -67,8 +69,6 @@ extern "C"
#include "gnc-engine.h" #include "gnc-engine.h"
} }
#include <dialog-options.hpp>
#include "gnc-optiondb.h"
static QofLogModule log_module = GNC_MOD_IMPORT; static QofLogModule log_module = GNC_MOD_IMPORT;

6
gnucash/gnome/dialog-report-column-view.cpp
View File

@ -21,10 +21,12 @@
* Boston, MA 02110-1301, USA gnu@gnu.org * * Boston, MA 02110-1301, USA gnu@gnu.org *
********************************************************************/ ********************************************************************/
#include <libguile.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <algorithm> #include <algorithm>
#include <dialog-options.hpp>
#include <gnc-optiondb-impl.hpp>
#include <libguile.h>
extern "C" extern "C"
{ {
@ -40,9 +42,7 @@ extern "C"
} }
#include "dialog-report-column-view.hpp" #include "dialog-report-column-view.hpp"
#include <dialog-options.hpp>
#include <gnc-report.h> #include <gnc-report.h>
#include "gnc-optiondb-impl.hpp"
enum available_cols enum available_cols
{ {

6
gnucash/gnome/dialog-report-style-sheet.cpp
View File

@ -22,9 +22,11 @@
* Boston, MA 02110-1301, USA gnu@gnu.org * * Boston, MA 02110-1301, USA gnu@gnu.org *
********************************************************************/ ********************************************************************/
#include <libguile.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <dialog-options.hpp>
#include <gnc-optiondb.h>
#include <libguile.h>
extern "C" extern "C"
{ {
@ -41,8 +43,6 @@ extern "C"
#include <guile-mappings.h> #include <guile-mappings.h>
} }
#include "gnc-report.h" #include "gnc-report.h"
#include <dialog-options.hpp>
#include "gnc-optiondb.h"
#define DIALOG_STYLE_SHEETS_CM_CLASS "style-sheets-dialog" #define DIALOG_STYLE_SHEETS_CM_CLASS "style-sheets-dialog"
#define GNC_PREFS_GROUP "dialogs.style-sheet" #define GNC_PREFS_GROUP "dialogs.style-sheet"

4
gnucash/gnome/gnc-plugin-page-report.cpp
View File

@ -36,10 +36,11 @@
@author Copyright (C) 2004 Joshua Sled <jsled@asynchronous.org> @author Copyright (C) 2004 Joshua Sled <jsled@asynchronous.org>
@author Copyright (C) 2005 David Hampton <hampton@employees.org> @author Copyright (C) 2005 David Hampton <hampton@employees.org>
*/ */
#include <libguile.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gnc-optiondb-impl.hpp>
#include <libguile.h>
extern "C" extern "C"
{ {
@ -80,7 +81,6 @@ extern "C"
#include <memory> #include <memory>
#include <gnc-report.h> #include <gnc-report.h>
#include "gnc-optiondb-impl.hpp"
/* NW: you can add GNC_MOD_REPORT to gnc-engine.h /* NW: you can add GNC_MOD_REPORT to gnc-engine.h
or simply define it locally. Any unique string with or simply define it locally. Any unique string with

6
gnucash/gnome/window-report.cpp
View File

@ -24,9 +24,11 @@
* Boston, MA 02110-1301, USA gnu@gnu.org * * Boston, MA 02110-1301, USA gnu@gnu.org *
* * * *
********************************************************************/ ********************************************************************/
#include <libguile.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <memory> #include <memory>
#include "dialog-options.hpp"
#include "dialog-report-column-view.hpp"
#include <libguile.h>
extern "C" extern "C"
{ {
@ -44,8 +46,6 @@ extern "C"
#include "gnc-plugin-page-report.h" #include "gnc-plugin-page-report.h"
} }
#include "gnc-report.h" #include "gnc-report.h"
#include "dialog-options.hpp"
#include "dialog-report-column-view.hpp"
/******************************************************************** /********************************************************************
* *

1
gnucash/report/gnc-report.cpp
View File

@ -26,6 +26,7 @@
#ifdef __MINGW32__ #ifdef __MINGW32__
#define _GL_UNISTD_H //Deflect poisonous define in Guile's GnuLib #define _GL_UNISTD_H //Deflect poisonous define in Guile's GnuLib
#endif #endif
#include <gnc-optiondb.hpp>
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>

1
gnucash/report/gnc-report.h
View File

@ -28,7 +28,6 @@
#include <glib.h> #include <glib.h>
#include <libguile.h> #include <libguile.h>
#ifdef __cplusplus #ifdef __cplusplus
#include "gnc-optiondb.hpp"
extern "C" extern "C"
{ {
#endif #endif