Guard against macro versions of isblank().

tglsfdc · tglsfdc · commit ae02cf3c44a3 · 2003-04-12T22:28:33.000Z
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.96 2003/04/03 21:25:02 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.97 2003/04/12 22:28:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -70,8 +70,13 @@ static char *tokenize_inc_file(const char *inc_filename);
 
 /*
  * Some standard C libraries, including GNU, have an isblank() function.
- * Others, including Solaris, do not.  So we have our own.
+ * Others, including Solaris, do not.  So we have our own.  Watch out for
+ * macro-ized versions, too.
  */
+#ifdef isblank
+#undef isblank
+#endif
+
 static bool
 isblank(const char c)
 {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.96 2003/04/03 21:25:02 tgl Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.97 2003/04/12 22:28:33 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -70,8 +70,13 @@ static char tokenize_inc_file(const char inc_filename);`
`70`	`70`
`71`	`71`	`/*`
`72`	`72`	`* Some standard C libraries, including GNU, have an isblank() function.`
`73`		`- * Others, including Solaris, do not. So we have our own.`
	`73`	`+ * Others, including Solaris, do not. So we have our own. Watch out for`
	`74`	`+ * macro-ized versions, too.`
`74`	`75`	`*/`
	`76`	`+#ifdef isblank`
	`77`	`+#undef isblank`
	`78`	`+#endif`
	`79`	`+`
`75`	`80`	`static bool`
`76`	`81`	`isblank(const char c)`
`77`	`82`	`{`