summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2013-11-21 22:41:17 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2013-11-21 22:41:17 +0000
commit7348cf1e4e3ef512d32007931c5fb144784db9e2 (patch)
tree408b7c6fadab5838197dfbcefd446320edc04028 /src/main.cpp
parentthe C++11 fails without this small change in constness of a GSList iterator (diff)
downloadinkscape-7348cf1e4e3ef512d32007931c5fb144784db9e2.tar.gz
inkscape-7348cf1e4e3ef512d32007931c5fb144784db9e2.zip
reorder header file includes. Because glibmm depends on a deprecated/threads.h of glib, it has to be included first.
(bzr r12830)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index c6427dc6f..9f5a95ffe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,12 +26,13 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "path-prefix.h"
// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
#include <png.h>
-#include "ui/widget/panel.h"
+#include "ui/widget/panel.h" // This has to be the first to include <glib.h> because of Glibmm's dependence on a deprecated feature...
+
+#include "path-prefix.h"
#ifdef HAVE_IEEEFP_H
#include <ieeefp.h>