diff options
| author | Bruce Momjian | 2004-10-06 16:36:02 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2004-10-06 16:36:02 +0000 |
| commit | 87ea6f0dbeae12fe4c7803d253782e09df2d517b (patch) | |
| tree | cdda80c6c04f1b12e4535623e0440064b0b181c6 /src | |
| parent | afa66ff3d37bcba50cff81b552db816a6d6a82f8 (diff) | |
Use #define instead of typedef for plperl because perl defines
uid_t/gid_t too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/port/win32.h | 10 | ||||
| -rw-r--r-- | src/pl/plperl/plperl.c | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/include/port/win32.h b/src/include/port/win32.h index d3ca1f20d8..8f4e00e2ad 100644 --- 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 index c517ca0c3c..3d81d6095b 100644 --- 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 */ |