diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2013-11-21 22:41:17 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2013-11-21 22:41:17 +0000 |
| commit | 7348cf1e4e3ef512d32007931c5fb144784db9e2 (patch) | |
| tree | 408b7c6fadab5838197dfbcefd446320edc04028 | |
| parent | the C++11 fails without this small change in constness of a GSList iterator (diff) | |
| download | inkscape-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)
| -rw-r--r-- | src/main.cpp | 5 | ||||
| -rw-r--r-- | src/ui/dialog/ocaldialogs.cpp | 3 |
2 files changed, 5 insertions, 3 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> diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index ca0edfadd..417df9a27 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -16,13 +16,14 @@ # include <config.h> #endif +#include "ocaldialogs.h" + #include <stdio.h> // rename() #include <unistd.h> // close() #include <errno.h> // errno #include <string.h> // strerror() #include "path-prefix.h" -#include "ocaldialogs.h" #include "filedialogimpl-gtkmm.h" #include "interface.h" #include "gc-core.h" |