first set of updates to headers for clean gcc 4.3 builds

diff --git a/src/dialogs/object-attributes.cpp b/src/dialogs/object-attributes.cpp
index ee355a7740c0c2a7db18ad00a72edbaeb60c797a..f23e986b123b00a1fad7a28903507dce17aeccbd 100644 (file)
--- a/src/dialogs/object-attributes.cpp
+++ b/src/dialogs/object-attributes.cpp
@@ -15,7 +15,10 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
+#include <string.h>
 #include <glibmm/i18n.h>
+
 #include "helper/window.h"
 #include "macros.h"
 #include "sp-anchor.h"

diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index bcf5e92a01ac2004dcfd7d5d275623390a86625d..01148c44c834bb5d2ccc99ee95af91bfa2d863b0 100644 (file)
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -15,7 +15,7 @@
  * Released under GNU GPL
  */
 
-
+#include <string.h>
 #include <glib/gmem.h>
 #include <display/curve.h>
 #include <libnr/n-art-bpath.h>

diff --git a/src/event-context.cpp b/src/event-context.cpp
index 25abe965b3f8a52d6895686f8df413acb290300b..146237346b1360899a7e97afecb2f8381ccbd096 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -27,6 +27,7 @@
 # include "config.h"
 #endif
 
+#include <string.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenu.h>

diff --git a/src/helper-fns.h b/src/helper-fns.h
index a4ce8e3b5add02b4229fc4c5780140b071f7d000..b1a1e37f05f744bcf689db179165a9d33bb7627b 100644 (file)
--- a/src/helper-fns.h
+++ b/src/helper-fns.h
@@ -13,6 +13,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string.h>
+
 #include <sstream>
 
 // calling helperfns_read_number(string, false), it's not obvious, what

diff --git a/src/libnr/n-art-bpath.h b/src/libnr/n-art-bpath.h
index abce499e084652f2a336888b76dc86ce5b11e07b..0f0f690fc3996f7aada6bc84def140d4dcf74475 100644 (file)
--- a/src/libnr/n-art-bpath.h
+++ b/src/libnr/n-art-bpath.h
@@ -5,6 +5,8 @@
  * NArtBpath: old-style path segment.
  */
 
+#include <stdlib.h>
+
 #include "libnr/nr-point.h"
 #include "libnr/nr-path-code.h"
 

diff --git a/src/libnr/nr-pixops.h b/src/libnr/nr-pixops.h
index 2c41f8dbf053006aaa1c39d7e7ae4a7a3a12d7cc..417e5e2c9e18df498a32700ccec7a5422723a205 100644 (file)
--- a/src/libnr/nr-pixops.h
+++ b/src/libnr/nr-pixops.h
@@ -19,8 +19,8 @@
 // FAST_DIVIDE assumes that 0<=num<=256*denom
 //   (this covers the case that num=255*denom+denom/2, which is used by DIV_ROUND)
 template<unsigned int divisor> static inline unsigned int FAST_DIVIDE(unsigned int v) { return v/divisor; }
-template<> static inline unsigned int FAST_DIVIDE<255>(unsigned int v) { return ((v+1)*0x101) >> 16; }
-template<> static inline unsigned int FAST_DIVIDE<255*255>(unsigned int v) { v=(v+1)<<1; v=v+(v>>7)+((v*0x3)>>16)+(v>>22); return (v>>16)>>1; }
+template<> inline unsigned int FAST_DIVIDE<255>(unsigned int v) { return ((v+1)*0x101) >> 16; }
+template<> inline unsigned int FAST_DIVIDE<255*255>(unsigned int v) { v=(v+1)<<1; v=v+(v>>7)+((v*0x3)>>16)+(v>>22); return (v>>16)>>1; }
 // FAST_DIV_ROUND assumes that 0<=num<=255*denom (DIV_ROUND should work upto num=2^32-1-(denom/2),
 // but FAST_DIVIDE_BY_255 already fails at num=65790=258*255, which is not too far above 255.5*255)
 template<unsigned int divisor> static inline unsigned int FAST_DIV_ROUND(unsigned int v) { return FAST_DIVIDE<divisor>(v+(divisor)/2); }

diff --git a/src/message-stack.cpp b/src/message-stack.cpp
index d6967fbf80f6eba11259f2e710c02b0264eee62c..33a23e7f38a78b116c7a8b2ece3964d227b6b1d4 100644 (file)
--- a/src/message-stack.cpp
+++ b/src/message-stack.cpp
@@ -9,6 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string.h>
 #include <glib/gstrfuncs.h>
 #include "message-stack.h"
 

diff --git a/src/pedro/pedroconfig.cpp b/src/pedro/pedroconfig.cpp
index fdade21d7743f07eee16ebf1a4ea8320f8e5ab9c..08b9cd17b4b686dfde4a0673f62a6c047471650a 100644 (file)
--- a/src/pedro/pedroconfig.cpp
+++ b/src/pedro/pedroconfig.cpp
@@ -49,6 +49,8 @@ We are expecting an xml file with this format:
 #include "pedrodom.h"
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 namespace Pedro
 {

diff --git a/src/pedro/pedroxmpp.cpp b/src/pedro/pedroxmpp.cpp
index 1dc1d7ced87af33500edbbd8f9708a2c18c1235f..bed99004f58a903e6ac75ebdc619944771b3e165 100644 (file)
--- a/src/pedro/pedroxmpp.cpp
+++ b/src/pedro/pedroxmpp.cpp
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
 #include <sys/stat.h>
 

diff --git a/src/selcue.cpp b/src/selcue.cpp
index 3bac1713cce95bebf71b8fad2664d30349c69104..4eba1f7560e3d3dfd7d89c06202117c6e4e7ff9c 100644 (file)
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -12,6 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string.h>
+
 #include "desktop-handles.h"
 #include "selection.h"
 #include "display/sp-canvas-util.h"

diff --git a/src/shape-editor.cpp b/src/shape-editor.cpp
index a2a9a86ebb38952f289c40dea12371aace0d548f..0f630ac503482748969465d45d3e07a88f39ca5a 100644 (file)
--- a/src/shape-editor.cpp
+++ b/src/shape-editor.cpp
@@ -12,6 +12,7 @@
 #include "config.h"
 #endif
 
+#include <string.h>
 #include <glibmm/i18n.h>
 
 #include "sp-object.h"

diff --git a/src/sp-fecolormatrix.cpp b/src/sp-fecolormatrix.cpp
index 60d312db1eee97502368e2af03d1d7d286c3ae2e..4f4ca5f37efa0243f5826874a3968587fbc23617 100644 (file)
--- a/src/sp-fecolormatrix.cpp
+++ b/src/sp-fecolormatrix.cpp
@@ -19,6 +19,8 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include "attributes.h"
 #include "svg/svg.h"
 #include "sp-fecolormatrix.h"

diff --git a/src/sp-fecomponenttransfer.cpp b/src/sp-fecomponenttransfer.cpp
index bb51f55bed0f416a1f35f25d642af1700343b22e..f9ecaa47ca87ee16d97f53839082e65ce9052497 100644 (file)
--- a/src/sp-fecomponenttransfer.cpp
+++ b/src/sp-fecomponenttransfer.cpp
@@ -17,6 +17,8 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include "attributes.h"
 #include "svg/svg.h"
 #include "sp-fecomponenttransfer.h"

diff --git a/src/sp-feconvolvematrix.cpp b/src/sp-feconvolvematrix.cpp
index a00a009cb2329c420a30ede97f1f18d6578ee9f0..b50d849751ca8a8ede7013904ed7451c2b2fcc20 100644 (file)
--- a/src/sp-feconvolvematrix.cpp
+++ b/src/sp-feconvolvematrix.cpp
@@ -18,6 +18,8 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include <vector>
 #include "attributes.h"
 #include "svg/svg.h"

diff --git a/src/sp-femorphology.cpp b/src/sp-femorphology.cpp
index 77d76f7dccc376f48db4d291c43e1369d1ef7338..fa7a3ddb0205a6e7d605b0ef05475011f60fb974 100644 (file)
--- a/src/sp-femorphology.cpp
+++ b/src/sp-femorphology.cpp
@@ -18,6 +18,8 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include "attributes.h"
 #include "svg/svg.h"
 #include "sp-femorphology.h"

diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp
index e8b7593f0a9e5e5ecb57eaaacafcd67968219ad5..39661788e9d8ecb91da974369bebae83976de3f0 100644 (file)
--- a/src/sp-filter-primitive.cpp
+++ b/src/sp-filter-primitive.cpp
@@ -18,6 +18,8 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include "attributes.h"
 #include "sp-filter-primitive.h"
 #include "xml/repr.h"

diff --git a/src/sp-use-reference.cpp b/src/sp-use-reference.cpp
index b8c724558bb84f0476c03afc27bac68be32756e0..c7923504ae532314992fba0bc24e7f1ac1b1d6eb 100644 (file)
--- a/src/sp-use-reference.cpp
+++ b/src/sp-use-reference.cpp
@@ -7,6 +7,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
+#include <string.h>
+
 #include "enums.h"
 #include "sp-use-reference.h"
 

diff --git a/src/streams-gzip.cpp b/src/streams-gzip.cpp
index 4233be7c05e60dfa723faf8082f707ad2be22585..9cd1077703cca5c44dd982ee154a33cfefcd60e9 100644 (file)
--- a/src/streams-gzip.cpp
+++ b/src/streams-gzip.cpp
@@ -9,6 +9,8 @@
  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
  */
 
+#include <string.h>
+
 #include "streams-gzip.h"
 
 namespace Inkscape {

diff --git a/src/streams-zlib.cpp b/src/streams-zlib.cpp
index 9e139e3016c31e41272eaa7d1e0e36683da1711e..60953ad5fe327fa476a6ff3c90e3283f4cd34aac 100644 (file)
--- a/src/streams-zlib.cpp
+++ b/src/streams-zlib.cpp
@@ -9,6 +9,7 @@
  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
  */
 
+#include <string.h>
 #include <vector>
 #include "streams-zlib.h"
 

diff --git a/src/svg/svg.h b/src/svg/svg.h
index 60b44f8e86cd8d3b82ea59b50bbf9cebd5ee0239..1881fb4a0e40b683a0a581c14eb5b6497ee3be02 100644 (file)
--- a/src/svg/svg.h
+++ b/src/svg/svg.h
@@ -14,6 +14,7 @@
 #include <glib/gtypes.h>
 #include "svg/svg-length.h"
 #include <vector>
+#include <string>
 
 struct NArtBpath;
 struct NRMatrix;

diff --git a/src/verbs.h b/src/verbs.h
index 104d4db0de471f05e40f65d2331e7e1cdd0f985a..2d0d3d0b634d61519da702465ed4dd6a458a9360 100644 (file)
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -16,6 +16,7 @@
  * This code is GPL if done by Ted or David
  */
 
+#include <string.h>
 #include "require-config.h"   /* HAVE_GTK_WINDOW_FULLSCREEN */
 #include "helper/helper-forward.h"
 #include "forward.h"