From ef9e7021eb44c11e374166c448519a34d61e0050 Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@novell.com>
Date: Tue, 26 Jan 1999 20:56:57 +0000
Subject: [PATCH] Temporary fix:

Use the system regex.h header file.

Miguel
---
 src/regex.h | 7 ++++++-
 src/util.c  | 2 +-
 src/view.c  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/regex.h b/src/regex.h
index 31eaf849f..8d1758bd7 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -347,7 +347,10 @@ struct re_pattern_buffer
 /* [[[end pattern_buffer]]] */
 };
 
+#if 0
 typedef struct re_pattern_buffer regex_t;
+#endif
+
 
 /* Type for byte offsets within the string.  POSIX mandates this.  */
 typedef int regoff_t;
@@ -370,7 +373,7 @@ struct re_registers
 #define RE_NREGS 30
 #endif
 
-
+#if 0
 /* POSIX specification for registers.  Aside from the different names than
    `re_registers', POSIX uses an array of structures, instead of a
    structure of arrays.  */
@@ -379,6 +382,8 @@ typedef struct
   regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
   regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
 } regmatch_t;
+#endif
+
 
 /* Declarations for routines.  */
 
diff --git a/src/util.c b/src/util.c
index ef1592fe9..47576147e 100644
--- a/src/util.c
+++ b/src/util.c
@@ -78,7 +78,7 @@ int message (int error, char *header, char *text, ...);
 #if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
 #include <rx.h>
 #else
-#include "regex.h"
+#include <regex.h>
 #endif
 #include "util.h"
 #include "global.h"
diff --git a/src/view.c b/src/view.c
index a2fc9c4a1..2158cb705 100644
--- a/src/view.c
+++ b/src/view.c
@@ -68,7 +68,7 @@
 #if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
 #    include <rx.h>
 #else
-#    include "regex.h"
+#    include <regex.h>
 #endif
 #include "fs.h"
 #include "../vfs/vfs.h"