diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2009-02-26 21:28:12 +0000 |
|---|---|---|
| committer | tweenk <tweenk@users.sourceforge.net> | 2009-02-26 21:28:12 +0000 |
| commit | f1b7b6decc60830d3a0072f3287d63ef086c936e (patch) | |
| tree | 2d237781196c25b0db77771215b02364f791156a /src/dialogs/export.cpp | |
| parent | Spellcheck, snap and filter translation (diff) | |
| download | inkscape-f1b7b6decc60830d3a0072f3287d63ef086c936e.tar.gz inkscape-f1b7b6decc60830d3a0072f3287d63ef086c936e.zip | |
Patch from Lubomir Rintel: fixes for GCC 4.4
(bzr r7380)
Diffstat (limited to 'src/dialogs/export.cpp')
| -rw-r--r-- | src/dialogs/export.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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 ) |