From 05adbccda8c54e4b54d117c227e77f9d58dafef5 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Sun, 19 Aug 2001 16:23:24 +0000
Subject: [PATCH] * fs.h: Correctly include <sys/param.h>. * x.h: Include
 "global.h".  Move all contents ... * global.h: Here.

---
 src/ChangeLog |  4 ++++
 src/fs.h      |  4 ++--
 src/global.h  | 20 +++++++++++++++++++-
 src/x.h       | 14 +-------------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 3e8d8551b..5dbea191b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-19  Pavel Roskin  <proski@gnu.org>
 
+	* fs.h: Correctly include <sys/param.h>.
+	* x.h: Include "global.h".  Move all contents ...
+	* global.h: Here.
+
 	* regex.c (regex_compile): Warning fix for ambiguous else.
 
 2001-08-18  Pavel Roskin  <proski@gnu.org>
diff --git a/src/fs.h b/src/fs.h
index 8f1a78f89..7c3af8a4c 100644
--- a/src/fs.h
+++ b/src/fs.h
@@ -6,8 +6,8 @@
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-#ifndef HAS_NO_SYS_PARAM_H
-#include <sys/param.h>
+#ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
 #endif
 #include <sys/stat.h>
 
diff --git a/src/global.h b/src/global.h
index 31ed1aa9b..c9793975f 100644
--- a/src/global.h
+++ b/src/global.h
@@ -2,12 +2,30 @@
 #define __GLOBAL_H
 
 #include <stdlib.h>	/* for free() and other usefull routins */
-#include "fs.h"
+#ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#endif
 #include <glib.h>
+
+#ifdef HAVE_GNOME
+#   define GNOME_REGEX_H
+#   include <gnome.h>
+#endif
+
+#include "fs.h"
 #include "mem.h"
 #include "util.h"
 #include "mad.h"
 
+#ifndef HAVE_X
+#   include "textconf.h"
+#endif
+
+#ifdef HAVE_GNOME
+#   include "gconf.h"
+#   include "gmain.h"
+#endif
+
 extern char *home_dir;
 
 #ifdef min
diff --git a/src/x.h b/src/x.h
index 2888bc9bc..d226a6ae3 100644
--- a/src/x.h
+++ b/src/x.h
@@ -1,18 +1,6 @@
 #ifndef __X_H
 #define __X_H
 
-#ifndef HAVE_X
-#   include "textconf.h"
-#endif
-
-#ifdef HAVE_GNOME
-#   ifdef HAVE_SYS_PARAM_H
-#      include <sys/param.h>
-#   endif
-#   define GNOME_REGEX_H
-#   include <gnome.h>
-#   include "gconf.h"
-#   include "gmain.h"
-#endif
+#include "global.h"
 
 #endif /* __X_H */