summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/port/win32.h10
1 files changed, 9 insertions, 1 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;
/*