From 23798fbd5109efcb4d82aad1ee5de924b9b565cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Dejean?= <bdejean@src.gnome.org>
Date: Fri, 7 Nov 2008 23:58:43 +0000
Subject: [PATCH] Single glib.h include. Closes #557826.

svn path=/trunk/; revision=2785
---
 glibtop.h                   | 2 +-
 src/daemon/gnuserv.c        | 3 ---
 sysdeps/common/error.c      | 2 +-
 sysdeps/common/error_suid.c | 2 +-
 sysdeps/solaris/safeio.h    | 2 +-
 sysdeps/sun4/open.c         | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/glibtop.h b/glibtop.h
index 877d7bc0..1befd20b 100644
--- a/glibtop.h
+++ b/glibtop.h
@@ -22,7 +22,7 @@
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/daemon/gnuserv.c b/src/daemon/gnuserv.c
index 8243b871..6965946b 100644
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -36,9 +36,6 @@
 #include <glibtop/open.h>
 #include <glibtop/close.h>
 #include <glibtop/command.h>
-
-#include <glib/gstrfuncs.h>
-
 #include <glibtop/parameter.h>
 
 #include "server_config.h"
diff --git a/sysdeps/common/error.c b/sysdeps/common/error.c
index a8f9d011..d1c151f0 100644
--- a/sysdeps/common/error.c
+++ b/sysdeps/common/error.c
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <errno.h>
 
 #include <glibtop/error.h>
diff --git a/sysdeps/common/error_suid.c b/sysdeps/common/error_suid.c
index 8e4603ba..3d200d67 100644
--- a/sysdeps/common/error_suid.c
+++ b/sysdeps/common/error_suid.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <errno.h>
 
 #include <glibtop/error.h>
diff --git a/sysdeps/solaris/safeio.h b/sysdeps/solaris/safeio.h
index aa367691..f1f5c6f9 100644
--- a/sysdeps/solaris/safeio.h
+++ b/sysdeps/solaris/safeio.h
@@ -22,7 +22,7 @@
 #ifndef __GLIBTOP_SAFEIO_H__
 #define __GLIBTOP_SAFEIO_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/sysdeps/sun4/open.c b/sysdeps/sun4/open.c
index 3daeed96..81218c38 100644
--- a/sysdeps/sun4/open.c
+++ b/sysdeps/sun4/open.c
@@ -20,7 +20,7 @@
 */
 
 #include <config.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <errno.h>
 
 #include <glibtop.h>