diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-23 21:17:06 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-23 21:17:06 +0000 |
| commit | 54b37c8fa5f39477f8d6fb50e90c7152806514d1 (patch) | |
| tree | bada98f3274c59825cbacf077fef07275108f8d4 /src/main.cpp | |
| parent | Update to trunk (diff) | |
| parent | reorder header file includes. Because glibmm depends on a deprecated/threads.... (diff) | |
| download | inkscape-54b37c8fa5f39477f8d6fb50e90c7152806514d1.tar.gz inkscape-54b37c8fa5f39477f8d6fb50e90c7152806514d1.zip | |
Update to trunk
(bzr r11950.1.203)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
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> |