From 9e36fa257d6519805fc43839d5f0242246142770 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Wed, 21 Aug 2002 07:20:39 +0000
Subject: [PATCH] * global.h: Move include for rx.h and eregex.h here.

---
 edit/edit.h   | 6 ------
 src/ChangeLog | 2 ++
 src/find.c    | 6 ------
 src/global.h  | 6 ++++++
 src/util.c    | 6 ------
 src/view.c    | 5 -----
 6 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/edit/edit.h b/edit/edit.h
index e135bbb62..496d8511a 100644
--- a/edit/edit.h
+++ b/edit/edit.h
@@ -44,12 +44,6 @@
 #    include <malloc.h>
 #endif
 
-#if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
-#    include <rx.h>
-#else
-#    include "src/eregex.h"
-#endif
-
 #include "src/global.h"
 #include "src/tty.h"
 #include "src/main.h"		/* for char *shell */
diff --git a/src/ChangeLog b/src/ChangeLog
index ad134675c..a1f750e67 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2002-08-21  Pavel Roskin  <proski@gnu.org>
 
+	* global.h: Move include for rx.h and eregex.h here.
+
 	* learn.c (learn_button): Don't allow Tab to be learned.
 
 2002-08-20  David Martin  <dmartina@excite.com>
diff --git a/src/find.c b/src/find.c
index e3feee734..09ba450e6 100644
--- a/src/find.c
+++ b/src/find.c
@@ -46,12 +46,6 @@
 #include "boxes.h"
 #include "../vfs/vfs.h"
 
-#if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
-#    include <rx.h>
-#else
-#    include "eregex.h"
-#endif
-
 /* Size of the find parameters window */
 #define FIND_Y 14
 static int FIND_X = 50;
diff --git a/src/global.h b/src/global.h
index 6b4319568..3e9850e97 100644
--- a/src/global.h
+++ b/src/global.h
@@ -83,6 +83,12 @@ struct timeval {
 
 #include <glib.h>
 
+#if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
+#include <rx.h>
+#else
+#include "eregex.h"
+#endif
+
 #ifndef __GNUC__
 #  define __attribute__(x)
 #endif
diff --git a/src/util.c b/src/util.c
index 0e71b9ec9..73513bb3d 100644
--- a/src/util.c
+++ b/src/util.c
@@ -36,12 +36,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
-#include <rx.h>
-#else
-#include "eregex.h"
-#endif
-
 #include "global.h"
 #include "profile.h"
 #include "main.h"		/* mc_home */
diff --git a/src/view.c b/src/view.c
index e5068c82e..c4b64eab8 100644
--- a/src/view.c
+++ b/src/view.c
@@ -40,11 +40,6 @@
 #include <ctype.h>	/* For toupper() */
 #include <errno.h>
 #include <limits.h>
-#if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
-#    include <rx.h>
-#else
-#    include "eregex.h"
-#endif
 
 #include "global.h"
 #include "tty.h"