Patch from Lubomir Rintel: fixes for GCC 4.4

diff --git a/src/2geom/sbasis-math.cpp b/src/2geom/sbasis-math.cpp
index e08023e84df17f04fec0d1eb3e071efa5479aaf4..d7045a3a9b879adfa20f54ca259edece3a3640fd 100644 (file)
--- a/src/2geom/sbasis-math.cpp
+++ b/src/2geom/sbasis-math.cpp
@@ -37,13 +37,12 @@
 #include <2geom/sbasis-math.h>
 //#define ZERO 1e-3
 
+#include <stdio.h>
+#include <math.h>
 
 namespace Geom {
 
-
 #include <2geom/d2-sbasis.h>
-#include <stdio.h>
-#include <math.h>
 
 //-|x|-----------------------------------------------------------------------
 /** Return the absolute value of a function pointwise.

diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index c8a76e4e608e38a942952344bb1e7c69fc7a9aaf..dd96431f07782df199740596ff73963bdb0e03db 100644 (file)
--- 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 )

diff --git a/src/document.cpp b/src/document.cpp
index fe6ce011b9590291894f9c04155bd53385af969d..2a9014e3e3a91893d6fefce6aa7b917768d139d8 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -800,7 +800,7 @@ Glib::ustring SPDocument::getLanguage() {
         }
 
         if ( NULL != document_language ) {
-            gchar *pos = strchr(document_language, '_');
+            const char *pos = strchr(document_language, '_');
             if ( NULL != pos ) {
                 return Glib::ustring(document_language, pos - document_language);
             }

diff --git a/src/dom/domimpl.cpp b/src/dom/domimpl.cpp
index 10daa1582a9c9b4d80fc15e80c0194329ff65b0d..e12f4071435e82f950441e6a74652d5605282924 100644 (file)
--- a/src/dom/domimpl.cpp
+++ b/src/dom/domimpl.cpp
@@ -28,6 +28,7 @@
  */
 
 
+#include <cstdio>
 #include "domimpl.h"
 
 namespace org

diff --git a/src/dom/io/domstream.cpp b/src/dom/io/domstream.cpp
index bc3810de037bed97e33c083ff3f422f641c6d797..b38dd532920f606145bc78f01b3661d610c431bc 100644 (file)
--- a/src/dom/io/domstream.cpp
+++ b/src/dom/io/domstream.cpp
@@ -34,6 +34,7 @@
  *
  */
 
+#include <cstdio>
 #include <math.h>
 #include <stdarg.h>
 

diff --git a/src/dom/io/domstream.h b/src/dom/io/domstream.h
index 7b999e317d96f82459861af135878923094cec31..0c60aca7a3822fc58b20c458fd1edba5329ee6cb 100644 (file)
--- a/src/dom/io/domstream.h
+++ b/src/dom/io/domstream.h
@@ -30,7 +30,7 @@
  */
 
 
-
+#include <cstdio>
 #include <dom/dom.h>
 
 namespace org

diff --git a/src/dom/io/socket.cpp b/src/dom/io/socket.cpp
index b800d7453cdface5cbea2d919113482b9a3d869b..e39032040c5eea6f72efc6d68ec1f749dae193a6 100644 (file)
--- a/src/dom/io/socket.cpp
+++ b/src/dom/io/socket.cpp
@@ -35,6 +35,7 @@
 #include <sys/filio.h>   // needed on Solaris 8
 #endif
 
+#include <cstdio>
 #include "socket.h"
 #include "dom/util/thread.h"
 

diff --git a/src/dom/io/uristream.cpp b/src/dom/io/uristream.cpp
index 0dc8423f4fb16169cabb8d5f20077d4f3431fb2a..3e47d99e1fc30e05ba5264f3390d5d0749091db7 100644 (file)
--- a/src/dom/io/uristream.cpp
+++ b/src/dom/io/uristream.cpp
@@ -30,6 +30,7 @@
 
 
 #include "uristream.h"
+#include <cstdio>
 #include <string.h>
 
 

diff --git a/src/dom/lsimpl.cpp b/src/dom/lsimpl.cpp
index b3b3f0b20cb59fa34635c7fadc38d70f546d44b2..6ee6d0883ca7d9023103786740a29cff2aa150be 100644 (file)
--- a/src/dom/lsimpl.cpp
+++ b/src/dom/lsimpl.cpp
@@ -33,6 +33,7 @@
 #include "lsimpl.h"
 
 #include <stdarg.h>
+#include <cstdio>
 
 namespace org
 {

diff --git a/src/dom/svgreader.cpp b/src/dom/svgreader.cpp
index ea4392f50fb494f0b1c0745956421690677dab03..4584ba32f8d635d73f8433a1ea3e8913fdd194bd 100644 (file)
--- a/src/dom/svgreader.cpp
+++ b/src/dom/svgreader.cpp
@@ -38,6 +38,7 @@
 #include "dom/ucd.h"
 #include "xmlreader.h"
 
+#include <cstdio>
 #include <stdarg.h>
 
 

diff --git a/src/dom/svgtypes.h b/src/dom/svgtypes.h
index 9b3d1caf6192c139ddc610ede5863d0154e0726d..09ed00bb5cd765e7005932f44933df1df5a7b73c 100644 (file)
--- a/src/dom/svgtypes.h
+++ b/src/dom/svgtypes.h
@@ -57,6 +57,7 @@
 #include "dom/smil.h"
 
 
+#include <cstdio>
 #include <math.h>
 
 

diff --git a/src/dom/xpathtoken.h b/src/dom/xpathtoken.h
index 9039006278981536bb9302f0627bb10a091cef8d..8683b2ee14bcb10be4ebd9dd4adebb0aec42d40b 100644 (file)
--- a/src/dom/xpathtoken.h
+++ b/src/dom/xpathtoken.h
@@ -35,6 +35,7 @@
 
 #include <math.h>
 
+#include <cstdio>
 #include <vector>
 
 namespace org

diff --git a/src/io/gzipstream.cpp b/src/io/gzipstream.cpp
index f19fd327d1ea8123183dfa32d45ebe14e5d297a5..ece0ddc67228e90d6e47ddbef5cb98c31eb4e15d 100644 (file)
--- a/src/io/gzipstream.cpp
+++ b/src/io/gzipstream.cpp
@@ -14,6 +14,7 @@
  */
 
 #include "gzipstream.h"
+#include <cstdio>
 #include <cstring>
 #include <string>
 

diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h
index 67c51cc7fa0bf33d463e2c29dd27e39814bc711d..9358b4d5113e0634bf258f235b6555466e49b234 100644 (file)
--- a/src/io/inkscapestream.h
+++ b/src/io/inkscapestream.h
@@ -12,6 +12,7 @@
  */
 
 
+#include <cstdio>
 #include <glibmm.h>
 
 namespace Inkscape

diff --git a/src/libavoid/vertices.h b/src/libavoid/vertices.h
index e82b163a6105661fb07defc9901f7fc1632669d6..1b0dcf3aa0331e04e99e5c4112815838254534b9 100644 (file)
--- a/src/libavoid/vertices.h
+++ b/src/libavoid/vertices.h
@@ -27,6 +27,7 @@
 #include <set>
 #include <map>
 #include <iostream>
+#include <cstdio>
 #include "libavoid/geomtypes.h"
 
 namespace Avoid {

diff --git a/src/libnr/nr-matrix-fns.cpp b/src/libnr/nr-matrix-fns.cpp
index f392f3213a69fbd4779d18f7dbb0d7777940dda7..c8eb986fae0264f66b6bea87a468a5c95a6fabfb 100644 (file)
--- a/src/libnr/nr-matrix-fns.cpp
+++ b/src/libnr/nr-matrix-fns.cpp
@@ -1,4 +1,5 @@
 #include <libnr/nr-matrix-fns.h>
+#include <cstdio>
 
 namespace NR {
 

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 {

diff --git a/src/prefix.cpp b/src/prefix.cpp
index 3af45269c2329065ff7ce1f4199a324bcdada2d9..f1fa3c2cdfae7e9eaff1da5c14b134de645d1103 100644 (file)
--- a/src/prefix.cpp
+++ b/src/prefix.cpp
@@ -356,7 +356,8 @@ br_strndup (char *str, size_t size)
 char *
 br_extract_dir (const char *path)
 {
-       char *end, *result;
+       const char *end;
+       char *result;
 
        br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
 
@@ -391,7 +392,8 @@ br_extract_dir (const char *path)
 char *
 br_extract_prefix (const char *path)
 {
-       char *end, *tmp, *result;
+       const char *end;
+       char *tmp, *result;
 
        br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
 

diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index e23dddaf629b25ff348b1ed5b37d77db0e3ead14..49350bd6941f90735898b023fe3a8186190329b1 100644 (file)
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -15,6 +15,9 @@
 # include "config.h"
 #endif
 
+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
+#include <png.h>
+
 #include <cstring>
 #include <string>
 #include <libnr/nr-matrix-fns.h>
@@ -45,7 +48,6 @@
 #include "libnr/nr-matrix-fns.h"
 
 #include "io/sys.h"
-#include <png.h>
 #if ENABLE_LCMS
 #include "color-profile-fns.h"
 #include "color-profile.h"

diff --git a/src/xml/event.cpp b/src/xml/event.cpp
index ded96e7224b388e2d0642a40b70ef7b5b7463944..23251eac6f4a9402666c387662b4121e14896b5e 100644 (file)
--- a/src/xml/event.cpp
+++ b/src/xml/event.cpp
@@ -14,6 +14,7 @@
  */
 
 #include <glib.h> // g_assert()
+#include <cstdio>
 
 #include "event.h"
 #include "event-fns.h"