Browse Source

* global.h: Move include for rx.h and eregex.h here.

Pavel Roskin 22 years ago
parent
commit
9e36fa257d
6 changed files with 8 additions and 23 deletions
  1. 0 6
      edit/edit.h
  2. 2 0
      src/ChangeLog
  3. 0 6
      src/find.c
  4. 6 0
      src/global.h
  5. 0 6
      src/util.c
  6. 0 5
      src/view.c

+ 0 - 6
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 */

+ 2 - 0
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>

+ 0 - 6
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;

+ 6 - 0
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

+ 0 - 6
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 */

+ 0 - 5
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"