Patch from Lubomir Rintel: fixes for GCC 4.4

[inkscape.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index bfee432ba920f7e0b7e9457ed4bfeac5d4f08935..991a95adda6554cdfb1eee20e3f3145480c661f1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,9 @@
 #endif
 #include "path-prefix.h"
 
+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
+#include <png.h>
+
 #include <gtk/gtkmessagedialog.h>
 
 #ifdef HAVE_IEEEFP_H
@@ -114,8 +117,6 @@ using Inkscape::Extension::Internal::PrintWin32;
 #include "widgets/icon.h"
 #include "ui/widget/panel.h"
 
-
-#include <png.h>
 #include <errno.h>
 
 enum {