From f1b7b6decc60830d3a0072f3287d63ef086c936e Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Thu, 26 Feb 2009 21:28:12 +0000
Subject: Patch from Lubomir Rintel: fixes for GCC 4.4

(bzr r7380)
---
 src/dialogs/export.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/dialogs/export.cpp')

diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index c8a76e4e6..dd96431f0 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -16,6 +16,9 @@
 # include "config.h"
 #endif
 
+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
+#include <png.h>
+
 #include <gtk/gtk.h>
 #include <gtkmm/box.h>
 #include <gtkmm/buttonbox.h>
@@ -56,7 +59,6 @@
 #include "io/sys.h"
 
 #include "helper/png-write.h"
-#include <png.h>
 
 
 #define SP_EXPORT_MIN_SIZE 1.0
@@ -1034,7 +1036,7 @@ create_progress_dialog (GtkObject *base, gchar *progress_text) {
 static gchar *
 filename_add_extension (const gchar *filename, const gchar *extension)
 {
-  gchar *dot;
+  const gchar *dot;
 
   dot = strrchr (filename, '.');
   if ( !dot )
-- 
cgit v1.2.3