From: rwst <rwst@users.sourceforge.net>
Date: Wed, 28 Jun 2006 09:01:27 +0000 (+0000)
Subject: do some include changes more correctly
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=73e65f5757df42f465548ed0d14dda31d15f05ca;p=inkscape.git

do some include changes more correctly
---

diff --git a/src/context-fns.cpp b/src/context-fns.cpp
index dfdc66c08..15138a10b 100644
--- 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 5a8046613..473c6dc62 100644
--- 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 92e2d0625..ec2878f5d 100644
--- 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 e50ba3e58..51c4c279f 100644
--- 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 0c0e139f7..008397e89 100644
--- 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 fbed6c845..eab05ca44 100644
--- 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>