From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 20 Apr 2003 17:37:22 +0000 (+0000)
Subject: Fix char-vs-pg_wchar confusion in p_ere(), per failure report from
X-Git-Tag: REL7_3_3~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ccfbe254a32fb95ca99e2facb95053a0d9c8db8;p=thirdparty%2Fpostgresql.git

Fix char-vs-pg_wchar confusion in p_ere(), per failure report from
Tom O'Dowd.  This fix is not relevant to CVS tip anymore, but we should
fix it in 7.3.*.
---

diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index 06c99139770..ef139cba5c3 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -78,7 +78,7 @@ struct parse
 	sopno		pend[NPAREN];	/* -> ) ([0] unused) */
 };
 
-static void p_ere(struct parse * p, int stop);
+static void p_ere(struct parse * p, pg_wchar stop);
 static void p_ere_exp(struct parse * p);
 static void p_str(struct parse * p);
 static void p_bre(struct parse * p, int end1, int end2);
@@ -292,9 +292,9 @@ pg_regcomp(regex_t *preg, const char *pattern, int cflags)
  */
 static void
 p_ere(struct parse * p,
-	  int stop)					/* character this ERE should end at */
+	  pg_wchar stop)			/* character this ERE should end at */
 {
-	char		c;
+	pg_wchar	c;
 	sopno		prevback = 0;
 	sopno		prevfwd = 0;
 	sopno		conc;