From 1a003fbcc2ac3dc199cd3f32c054d4a37d30a970 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Fri, 20 Sep 1996 08:34:39 +0000
Subject: Various patches from Bryan that *should* clean up the compile
 problems ppl are seeing with v2.0

---
 src/backend/regex/regcomp.c  | 11 +++++------
 src/backend/regex/regerror.c |  4 ++--
 src/backend/regex/regexec.c  |  6 +++---
 src/backend/regex/regfree.c  |  6 +++---
 4 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'src/backend/regex')

diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 186d6ecff86..88445cd50dc 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -47,13 +47,12 @@ static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <regex.h>
 
-#include "regex/utils.h"
-#include "regex/regex2.h"
-
-#include "regex/cclass.h"
-#include "regex/cname.h"
+#include <regex/regex.h>   
+#include <regex/utils.h>
+#include <regex/regex2.h>
+#include <regex/cclass.h>
+#include <regex/cname.h>
 
 /*
  * parse structure, passed up and down to avoid global variables and
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c
index 762398b51d9..dbfcc250613 100644
--- a/src/backend/regex/regerror.c
+++ b/src/backend/regex/regerror.c
@@ -47,9 +47,9 @@ static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 #include <ctype.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <regex.h>
 
-#include "regex/utils.h"
+#include <regex/regex.h>
+#include <regex/utils.h>
 
 /* ========= begin header generated by ./mkh ========= */
 #ifdef __cplusplus
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index 65fda30ff23..a34f3f8daff 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -54,10 +54,10 @@ static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
-#include <regex.h>
 
-#include "regex/utils.h"
-#include "regex/regex2.h"
+#include <regex/regex.h>
+#include <regex/utils.h>
+#include <regex/regex2.h>
 
 static int nope = 0;		/* for use in asserts; shuts lint up */
 
diff --git a/src/backend/regex/regfree.c b/src/backend/regex/regfree.c
index 73d66079c29..9a7ff5cb5e1 100644
--- a/src/backend/regex/regfree.c
+++ b/src/backend/regex/regfree.c
@@ -44,10 +44,10 @@ static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <regex.h>
 
-#include "regex/utils.h"
-#include "regex/regex2.h"
+#include <regex/regex.h>
+#include <regex/utils.h>
+#include <regex/regex2.h>
 
 /*
  - regfree - free everything
-- 
cgit v1.2.3