diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs
index de28459eba..93f7da246c 100644
--- a/src/pl/plperl/SPI.xs
+++ b/src/pl/plperl/SPI.xs
@@ -1,7 +1,7 @@
 /* this must be first: */
 #include "postgres.h"
 /* Defined by Perl */
-#undef _(x)
+#undef _
 
 /* perl stuff */
 #include "EXTERN.h"
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 75d04ff5a1..620448b508 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -33,13 +33,13 @@
  *	  ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.68 2005/02/22 04:42:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.69 2005/02/23 04:34:05 momjian Exp $
  *
  **********************************************************************/
 
 #include "postgres.h"
 /* Defined by Perl */
-#undef _(x)
+#undef _
 
 /* system stuff */
 #include <ctype.h>
diff --git a/src/pl/plperl/spi_internal.c b/src/pl/plperl/spi_internal.c
index 7e26c5d505..c022d7d9e5 100644
--- a/src/pl/plperl/spi_internal.c
+++ b/src/pl/plperl/spi_internal.c
@@ -6,7 +6,7 @@
 
 #include "postgres.h"
 /* Defined by Perl */
-#undef _(x)
+#undef _
 
 #include "spi_internal.h"
 
diff --git a/src/timezone/private.h b/src/timezone/private.h
index 5fc4be2d95..41df54639f 100644
--- a/src/timezone/private.h
+++ b/src/timezone/private.h
@@ -6,7 +6,7 @@
  * 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/private.h,v 1.10 2005/02/22 04:43:23 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/private.h,v 1.11 2005/02/23 04:34:21 momjian Exp $
  */
 
 /*
@@ -104,7 +104,7 @@ extern char *scheck(const char *string, const char *format);
 	((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
 #endif   /* !defined INT_STRLEN_MAXIMUM */
 
-#undef _(x)
+#undef _
 #define _(msgid) (msgid)
 
 /*