Index: src/include/port/win32.h
===================================================================
RCS file: /cvsroot/pgsql-server/src/include/port/win32.h,v
retrieving revision 1.37
diff -c -c -r1.37 win32.h
*** src/include/port/win32.h	6 Oct 2004 09:35:23 -0000	1.37
--- src/include/port/win32.h	6 Oct 2004 16:31:20 -0000
***************
*** 194,202 ****
--- 194,210 ----
  
  /*
   * Supplement to <sys/types.h>.
+  *
+  * Perl already has conflicting defines for uid_t and gid_t.
   */
+ #ifndef PLPERL_HAVE_UID_GID
  typedef int uid_t;
  typedef int gid_t;
+ #else
+ /* These are redefined by perl. */
+ #define int uid_t;
+ #define int gid_t;
+ #endif
  typedef long key_t;
  
  /*
Index: src/pl/plperl/plperl.c
===================================================================
RCS file: /cvsroot/pgsql-server/src/pl/plperl/plperl.c,v
retrieving revision 1.51
diff -c -c -r1.51 plperl.c
*** src/pl/plperl/plperl.c	13 Sep 2004 20:08:59 -0000	1.51
--- src/pl/plperl/plperl.c	6 Oct 2004 16:31:24 -0000
***************
*** 37,42 ****
--- 37,43 ----
   *
   **********************************************************************/
  
+ #define PLPERL_HAVE_UID_GID
  #include "postgres.h"
  
  /* system stuff */