Removed MBFLAGS from makefiles since it's now done in include/config.h.

6 files changed, 11 insertions, 2 deletions

diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile
index e9f569c4f56..9beda9746e8 100644
--- a/src/backend/regex/Makefile
+++ b/src/backend/regex/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for regex
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.11 1999/12/13 22:33:23 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.12 2000/01/19 02:58:53 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,7 +19,6 @@ DEBUGOBJ =
 OBJS = regcomp.o regerror.o regexec.o regfree.o
 
 ifdef MULTIBYTE
-CFLAGS+= $(MBFLAGS)
 DEBUGOBJ += ../utils/mb/SUBSYS.o
 endif
 
diff --git a/src/backend/regex/engine.c b/src/backend/regex/engine.c
index 698d5da7295..b4f68445492 100644
--- a/src/backend/regex/engine.c
+++ b/src/backend/regex/engine.c
@@ -37,6 +37,8 @@
  *		@(#)engine.c	8.5 (Berkeley) 3/20/94
  */
 
+#include "postgres.h"
+
 /*
  * The matching engine and friends.  This file is #included by regexec.c
  * after suitable #defines of a variety of macros used herein, so that
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index b6c01ef004f..65cf92fc565 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 
 #endif	 /* LIBC_SCCS and not lint */
 
+#include "postgres.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c
index 93b47330617..d44b6db57cf 100644
--- a/src/backend/regex/regerror.c
+++ b/src/backend/regex/regerror.c
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 
 #endif	 /* LIBC_SCCS and not lint */
 
+#include "postgres.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index ec71296cc42..c5a45b38895 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
 
 #endif	 /* LIBC_SCCS and not lint */
 
+#include "postgres.h"
+
 /*
  * the outer shell of regexec()
  *
diff --git a/src/backend/regex/regfree.c b/src/backend/regex/regfree.c
index f0a019b0f6f..55d5c628100 100644
--- a/src/backend/regex/regfree.c
+++ b/src/backend/regex/regfree.c
@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
 
 #endif	 /* LIBC_SCCS and not lint */
 
+#include "postgres.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>