Use #define instead of typedef for plperl because perl defines

uid_t/gid_t too.
This commit is contained in:
Bruce Momjian 2004-10-06 16:36:02 +00:00
parent afa66ff3d3
commit 87ea6f0dbe
2 changed files with 11 additions and 2 deletions

View File

@ -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;
/*

View File

@ -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 */