do some include changes more correctly

diff --git a/src/context-fns.cpp b/src/context-fns.cpp
index dfdc66c085c29a6cf157723436b2d16ba457646e..15138a10b6f9f188de86ce7b794526e33691b5bd 100644 (file)
--- a/src/context-fns.cpp
+++ b/src/context-fns.cpp
@@ -1,6 +1,7 @@
-extern "C" {
-#include <libintl.h>
-}
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glibmm/i18n.h>
 #include "sp-item.h"
 #include "desktop.h"

diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index 5a8046613dd775198543f8e43c738c8fa59f4afc..473c6dc6269fc7f7543d9d8e9a6c18dd9de66cd9 100644 (file)
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -7,16 +7,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
-extern "C" {           // glib-2.4 needs this
-#include <libintl.h>
-}
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <glibmm/i18n.h>
-
 #include "config.h"
 #include "path-prefix.h"
-
 #include "dependency.h"
 #include "db.h"
 

diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index 92e2d06255b37f52ac5e85bc24d80f426aa5f4c3..ec2878f5d46108d32dce7228dcf9fd15f8c58ad8 100644 (file)
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -8,9 +8,9 @@
  */
 
 
-extern "C" {           // glib-2.4 needs this
-#include <libintl.h>
-}
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <glibmm/i18n.h>
 

diff --git a/src/extension/script/InkscapeBinding.cpp b/src/extension/script/InkscapeBinding.cpp
index e50ba3e589ba27b6c9cf1db82a4cde99dd125117..51c4c279f4b1d93e1a498aa3c781e6b96db40e62 100644 (file)
--- a/src/extension/script/InkscapeBinding.cpp
+++ b/src/extension/script/InkscapeBinding.cpp
@@ -1,7 +1,8 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include <cstdio>
 #include "InkscapeBinding.h"
-
 #include "help.h"
 
 namespace Inkscape {

diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 0c0e139f7a2ea0cb341550bf108d05fc32aa9d67..008397e8922afc25377f16e04e0dc54e57f57eb9 100644 (file)
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -11,9 +11,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-extern "C" {           // glib-2.4 needs this
-#include <libintl.h>
-}
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <glibmm/i18n.h>
 

diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index fbed6c84515835fa2eacf5efce3e6425c8be180c..eab05ca44e5adfbd0bf961bced1bd74de8f7dc75 100644 (file)
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -12,9 +12,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-extern "C" {           // glib-2.4 needs this
-#include <libintl.h>
-}
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <glibmm/i18n.h>