Index: src/pl/plperl/SPI.xs
===================================================================
RCS file: /cvsroot/pgsql/src/pl/plperl/SPI.xs,v
retrieving revision 1.12
diff -c -c -r1.12 SPI.xs
*** src/pl/plperl/SPI.xs	22 Feb 2005 04:42:44 -0000	1.12
--- src/pl/plperl/SPI.xs	22 Feb 2005 18:05:37 -0000
***************
*** 1,7 ****
  /* this must be first: */
  #include "postgres.h"
  /* Defined by Perl */
! #undef _(x)
  
  /* perl stuff */
  #include "EXTERN.h"
--- 1,7 ----
  /* this must be first: */
  #include "postgres.h"
  /* Defined by Perl */
! #undef _
  
  /* perl stuff */
  #include "EXTERN.h"
Index: src/pl/plperl/plperl.c
===================================================================
RCS file: /cvsroot/pgsql/src/pl/plperl/plperl.c,v
retrieving revision 1.68
diff -c -c -r1.68 plperl.c
*** src/pl/plperl/plperl.c	22 Feb 2005 04:42:44 -0000	1.68
--- src/pl/plperl/plperl.c	22 Feb 2005 18:05:37 -0000
***************
*** 39,45 ****
  
  #include "postgres.h"
  /* Defined by Perl */
! #undef _(x)
  
  /* system stuff */
  #include <ctype.h>
--- 39,45 ----
  
  #include "postgres.h"
  /* Defined by Perl */
! #undef _
  
  /* system stuff */
  #include <ctype.h>
Index: src/pl/plperl/spi_internal.c
===================================================================
RCS file: /cvsroot/pgsql/src/pl/plperl/spi_internal.c,v
retrieving revision 1.6
diff -c -c -r1.6 spi_internal.c
*** src/pl/plperl/spi_internal.c	22 Feb 2005 04:42:44 -0000	1.6
--- src/pl/plperl/spi_internal.c	22 Feb 2005 18:05:37 -0000
***************
*** 6,12 ****
  
  #include "postgres.h"
  /* Defined by Perl */
! #undef _(x)
  
  #include "spi_internal.h"
  
--- 6,12 ----
  
  #include "postgres.h"
  /* Defined by Perl */
! #undef _
  
  #include "spi_internal.h"
  
Index: src/timezone/private.h
===================================================================
RCS file: /cvsroot/pgsql/src/timezone/private.h,v
retrieving revision 1.10
diff -c -c -r1.10 private.h
*** src/timezone/private.h	22 Feb 2005 04:43:23 -0000	1.10
--- src/timezone/private.h	22 Feb 2005 18:05:38 -0000
***************
*** 104,110 ****
  	((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
  #endif   /* !defined INT_STRLEN_MAXIMUM */
  
! #undef _(x)
  #define _(msgid) (msgid)
  
  /*
--- 104,110 ----
  	((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
  #endif   /* !defined INT_STRLEN_MAXIMUM */
  
! #undef _
  #define _(msgid) (msgid)
  
  /*