3 files changed, 10 insertions, 24 deletions
diff --git a/src/include/regex/cclass.h b/src/include/regex/cclass.h
index 2ab5eca33f5..8290810259c 100644
--- a/src/include/regex/cclass.h
+++ b/src/include/regex/cclass.h
@@ -94,6 +94,6 @@ static struct cclass
 		""
 	},
 	{
-		NULL, 0, ""
+		NULL, NULL, ""
 	}
 };
diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index b0b86f3cb6d..b0c136f83d3 100644
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -102,10 +102,12 @@ typedef struct
 #define REG_LARGE		01000	/* force large representation */
 #define REG_BACKR		02000	/* force use of backref code */
 
-int			pg95_regcomp(regex_t *, const char *, int);
-size_t		pg95_regerror(int, const regex_t *, char *, size_t);
-int pg95_regexec(const regex_t *,
-			 const char *, size_t, regmatch_t[], int);
-void		pg95_regfree(regex_t *);
+extern int pg95_regcomp(regex_t *preg, const char *pattern, int cflags);
+extern size_t pg95_regerror(int errcode, const regex_t *preg,
+							char *errbuf, size_t errbuf_size);
+extern int pg95_regexec(const regex_t *preg, const char *string,
+						size_t nmatch,
+						regmatch_t *pmatch, int eflags);
+extern void pg95_regfree(regex_t *preg);
 
 #endif	 /* !_REGEX_H_ */
diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h
index b885ff43182..8bcdddb65ab 100644
--- a/src/include/regex/regex2.h
+++ b/src/include/regex/regex2.h
@@ -40,22 +40,6 @@
 #include <limits.h>
 
 /*
- * First, the stuff that ends up in the outside-world include file
-*/
-/*
- typedef off_t regoff_t;
- typedef struct {
-		int re_magic;
-		size_t re_nsub;			// number of parenthesized subexpressions
-		const char *re_endp;	// end pointer for REG_PEND
-		struct re_guts *re_g;	// none of your business :-)
- } regex_t;
- typedef struct {
-		regoff_t rm_so;			// start of match
-		regoff_t rm_eo;			// end of match
- } regmatch_t;
-*/
-/*
  * internals of regex_t
  */
 #define MAGIC1	((('r'^0200)<<8) | 'e')
@@ -82,8 +66,8 @@
 typedef unsigned long sop;		/* strip operator */
 typedef long sopno;
 
-#define OPRMASK 0xf8000000
-#define OPDMASK 0x07ffffff
+#define OPRMASK ((sop) 0xf8000000)
+#define OPDMASK ((sop) 0x07ffffff)
 #define OPSHIFT ((unsigned)27)
 #define OP(n)	((n)&OPRMASK)
 #define OPND(n) ((n)&OPDMASK)