Commit 87ea6f0d authored by Bruce Momjian's avatar Bruce Momjian

Use #define instead of typedef for plperl because perl defines

uid_t/gid_t too.
parent afa66ff3
/* $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 */ /* undefine and redefine after #include */
#undef mkdir #undef mkdir
...@@ -194,9 +194,17 @@ int setitimer(int which, const struct itimerval * value, struct itimerval * ov ...@@ -194,9 +194,17 @@ int setitimer(int which, const struct itimerval * value, struct itimerval * ov
/* /*
* Supplement to <sys/types.h>. * 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 uid_t;
typedef int gid_t; typedef int gid_t;
#else
/* These are redefined by perl. */
#define int uid_t;
#define int gid_t;
#endif
typedef long key_t; typedef long key_t;
/* /*
......
...@@ -33,10 +33,11 @@ ...@@ -33,10 +33,11 @@
* ENHANCEMENTS, OR MODIFICATIONS. * ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * 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" #include "postgres.h"
/* system stuff */ /* system stuff */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment