Use #define instead of typedef for plperl because perl defines

bmomjian · bmomjian · commit 87ea6f0dbeae · 2004-10-06T16:36:02.000Z
uid_t/gid_t too.
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.37 2004/10/06 09:35:23 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.38 2004/10/06 16:36:02 momjian Exp $ */
 
 /* undefine and redefine after #include */
 #undef mkdir
@@ -194,9 +194,17 @@ int			setitimer(int which, const struct itimerval * value, struct itimerval * ov
 
 /*
  * 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;
 
 /*
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
@@ -33,10 +33,11 @@
  *	  ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.51 2004/09/13 20:08:59 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.52 2004/10/06 16:36:02 momjian Exp $
  *
  **********************************************************************/
 
+#define PLPERL_HAVE_UID_GID
 #include "postgres.h"
 
 /* system stuff */

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,11 @@`
`33`	`33`	`* ENHANCEMENTS, OR MODIFICATIONS.`
`34`	`34`	`*`
`35`	`35`	`* IDENTIFICATION`
`36`		`- * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.51 2004/09/13 20:08:59 tgl Exp $`
	`36`	`+ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.52 2004/10/06 16:36:02 momjian Exp $`
`37`	`37`	`*`
`38`	`38`	`**********************************************************************/`
`39`	`39`
	`40`	`+#define PLPERL_HAVE_UID_GID`
`40`	`41`	`#include "postgres.h"`
`41`	`42`
`42`	`43`	`/* system stuff */`