Commit87ea6f0

committed

Use #define instead of typedef for plperl because perl defines

uid_t/gid_t too.

1 parentafa66ff commit87ea6f0Copy full SHA for 87ea6f0

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.37 2004/10/0609:35:23 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.38 2004/10/0616:36:02 momjian Exp $ */`
`2`	`2`
`3`	`3`	`/* undefine and redefine after #include */`
`4`	`4`	`#undef mkdir`
`@@ -194,9 +194,17 @@ intsetitimer(int which, const struct itimerval * value, struct itimerval * ov`
`194`	`194`
`195`	`195`	`/*`
`196`	`196`	`* Supplement to <sys/types.h>.`
	`197`	`+ *`
	`198`	`+ * Perl already has conflicting defines for uid_t and gid_t.`
`197`	`199`	`*/`
	`200`	`+#ifndefPLPERL_HAVE_UID_GID`
`198`	`201`	`typedefintuid_t;`
`199`	`202`	`typedefintgid_t;`
	`203`	`+#else`
	`204`	`+/* These are redefined by perl. */`
	`205`	`+#defineint uid_t;`
	`206`	`+#defineint gid_t;`
	`207`	`+#endif`
`200`	`208`	`typedeflongkey_t;`
`201`	`209`
`202`	`210`	`/*`

Lines changed: 2 additions & 1 deletion

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`	`+#definePLPERL_HAVE_UID_GID`
`40`	`41`	`#include"postgres.h"`
`41`	`42`
`42`	`43`	`/* system stuff */`

Comments

(0)