From: bryce <bryce@users.sourceforge.net>
Date: Sat, 5 Jan 2008 08:55:11 +0000 (+0000)
Subject: glib/gtestutils.h is not available on gutsy, so switching to include of
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6cf4fe01f16c5713438743a95c971ed82c44c535;p=inkscape.git

glib/gtestutils.h is not available on gutsy, so switching to include of
glib.h, which will include that file on hardy, but on gutsy will include
gmessage.h.
---

diff --git a/src/attributes.cpp b/src/attributes.cpp
index be5dedc24..4169dee51 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -17,7 +17,7 @@
 # include "config.h"
 #endif
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/ghash.h>
 #include "attributes.h"
 
diff --git a/src/axis-manip.h b/src/axis-manip.h
index 0021630a0..7513bebaf 100644
--- a/src/axis-manip.h
+++ b/src/axis-manip.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_AXIS_MANIP_H
 #define SEEN_AXIS_MANIP_H
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <gtk/gtk.h>
 #include "libnr/nr-point.h"
 
diff --git a/src/color-rgba.h b/src/color-rgba.h
index b968f3de1..fc52b193d 100644
--- a/src/color-rgba.h
+++ b/src/color-rgba.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_COLOR_RGBA_H
 #define SEEN_COLOR_RGBA_H
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/gmessages.h>
 #include "libnr/nr-pixops.h"
 #include "decimal-round.h"
diff --git a/src/helper/units.cpp b/src/helper/units.cpp
index 45d6d27f9..a78f5e623 100644
--- a/src/helper/units.cpp
+++ b/src/helper/units.cpp
@@ -20,7 +20,7 @@
 #endif
 
 #include "helper/units.h"
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glibmm/i18n.h>
 #include "unit-constants.h"
 #include "svg/svg-length.h"
diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index 267a82d01..f7542855e 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -16,7 +16,7 @@
 #include "config.h"
 #endif
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 #include <glib/gmessages.h>
 #include <glib/gstrfuncs.h>
 #include <glib/gfileutils.h>
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index f0a2ae79d..fe79736dc 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -23,7 +23,7 @@
 #include <cassert>
 #include <math.h>
 #include <glib/gmem.h>
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert
 #include <glib/gmessages.h>
 #include <glib/gstrfuncs.h>
 #include <glib/ghash.h>
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index 86d8bc162..b491e61c0 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -30,7 +30,7 @@
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
 #include <glib/gstrfuncs.h>
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "libnr/n-art-bpath.h"
 #include "gnome-canvas-bpath-util.h"
diff --git a/src/xml/event.cpp b/src/xml/event.cpp
index 0e852ce97..d713200e5 100644
--- a/src/xml/event.cpp
+++ b/src/xml/event.cpp
@@ -13,7 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "event.h"
 #include "event-fns.h"
diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index 69317e2a6..4d346e009 100644
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -3,7 +3,7 @@
 #endif
 
 #include <map>
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "xml/node-iterators.h"
 #include "algorithms/find-if-before.h"
diff --git a/src/xml/simple-document.cpp b/src/xml/simple-document.cpp
index c06c0ed69..30e74a455 100644
--- a/src/xml/simple-document.cpp
+++ b/src/xml/simple-document.cpp
@@ -12,7 +12,7 @@
  *
  */
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "xml/simple-document.h"
 #include "xml/event-fns.h"
diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h
index 3bd2f58b4..60bb53454 100644
--- a/src/xml/simple-node.h
+++ b/src/xml/simple-node.h
@@ -15,7 +15,7 @@
 #ifndef SEEN_INKSCAPE_XML_SIMPLE_NODE_H
 #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H
 
-#include <glib/gtestutils.h>
+#include <glib.h> // g_assert()
 
 #include "xml/node.h"
 #include "xml/attribute-record.h"