Add fix for 0x7fU constants to pgindent

3 files changed, 30 insertions, 7 deletions

diff --git a/src/backend/utils/mb/big5.c b/src/backend/utils/mb/big5.c
index 4afc4d5cde..706eef93a0 100644
--- a/src/backend/utils/mb/big5.c
+++ b/src/backend/utils/mb/big5.c
@@ -218,7 +218,7 @@ static unsigned short BinarySearchRange
 		{
 			if (0 == array[mid].peer)
 				return 0;
-			if (code >= (unsigned) 0xa140)
+			if (code >= 0xa140U)
 			{
 				/* big5 to cns */
 				tmp = ((code & 0xff00) - (array[mid].code & 0xff00)) >> 8;
@@ -292,7 +292,7 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
 	unsigned short cns = 0;
 	int			i;
 
-	if (big5 < (unsigned) 0xc940)
+	if (big5 < 0xc940U)
 	{
 		/* level 1 */
 
@@ -301,14 +301,14 @@ BIG5toCNS(unsigned short big5, unsigned char *lc)
 			if (b1c4[i][0] == big5)
 			{
 				*lc = LC_CNS11643_4;
-				return (b1c4[i][1] | (unsigned) 0x8080);
+				return (b1c4[i][1] | 0x8080U);
 			}
 		}
 
 		if (0 < (cns = BinarySearchRange(big5Level1ToCnsPlane1, 23, big5)))
 			*lc = LC_CNS11643_1;
 	}
-	else if (big5 == (unsigned) 0xc94a)
+	else if (big5 == 0xc94aU)
 	{
 		/* level 2 */
 		*lc = LC_CNS11643_1;
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index ae79851f23..36b8b6ec7d 100644
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -384,7 +384,7 @@ big52mic(unsigned char *big5, unsigned char *p, int len)
 
 	while (len > 0 && (c1 = *big5++))
 	{
-		if (c1 <= (unsigned) 0x7f)
+		if (c1 <= 0x7fU)
 		{						/* ASCII */
 			len--;
 			*p++ = c1;
diff --git a/src/tools/pgindent/indent.bsd.patch b/src/tools/pgindent/indent.bsd.patch
index ba5d4756f4..93e3580901 100644
--- a/src/tools/pgindent/indent.bsd.patch
+++ b/src/tools/pgindent/indent.bsd.patch
@@ -1,6 +1,8 @@
 
 This increases the number of typedef's understood by BSD indent from 100
-to 1000.
+to 1000.  The second patch allows it to understand 0x7fU constants.
+
+---------------------------------------------------------------------------
 
 *** ./lexi.c.orig	Mon Sep  8 17:55:47 1997
 --- ./lexi.c	Mon Sep  8 17:02:10 1997
@@ -17,7 +19,28 @@ to 1000.
       int         rwcode;
   };
   
-! struct templ specials[1000] =
+! struct templ specials[4096] =
   {
       "switch", 1,
       "case", 2,
+
+*** ./lexi.c.orig	Wed May 26 10:50:54 1999
+--- ./lexi.c	Wed May 26 10:51:08 1999
+***************
+*** 186,192 ****
+  				*e_token++ = *buf_ptr++;
+  			}
+  		}
+! 	    if (*buf_ptr == 'L' || *buf_ptr == 'l')
+  		*e_token++ = *buf_ptr++;
+  	}
+  	else
+--- 186,193 ----
+  				*e_token++ = *buf_ptr++;
+  			}
+  		}
+! 	    if (*buf_ptr == 'L' || *buf_ptr == 'U' ||
+! 		*buf_ptr == 'l' || *buf_ptr == 'u')
+  		*e_token++ = *buf_ptr++;
+  	}
+  	else