ifdef out pqGetpwuid() because Win32 doesn't have struct passwd.

Needed for libpq builds, not just for native Win32 port, and probably
for cygwin too.

diff --git a/src/include/port.h b/src/include/port.h
index 4ff6710c30297385cf4b41c619415c0b92f89ea8..6b801ba424a223b37e594b11e39f679b92ee0f1a 100644 (file)
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: port.h,v 1.12 2003/08/08 21:42:31 momjian Exp $
+ * $Id: port.h,v 1.13 2003/09/05 17:43:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -112,8 +112,10 @@ extern void srandom(unsigned int seed);
 /* thread.h */
 extern char *pqStrerror(int errnum, char *strerrbuf, size_t buflen);
 
+#ifndef WIN32
 extern int pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer,
                   size_t buflen, struct passwd ** result);
+#endif
 
 extern int pqGethostbyname(const char *name,
                                struct hostent * resbuf,

diff --git a/src/port/thread.c b/src/port/thread.c
index 8446f01f8aa5512aa2edd268046c3f89742d2f35..c00202a0631d13221c486a69a2b72b6c06803c6c 100644 (file)
--- a/src/port/thread.c
+++ b/src/port/thread.c
@@ -7,7 +7,7 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $Id: thread.c,v 1.5 2003/09/03 19:30:31 momjian Exp $
+ * $Id: thread.c,v 1.6 2003/09/05 17:43:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,6 +66,7 @@ pqStrerror(int errnum, char *strerrbuf, size_t buflen)
  * Wrapper around getpwuid() or getpwuid_r() to mimic POSIX getpwuid_r()
  * behaviour, if it is not available or required.
  */
+#ifndef WIN32
 int
 pqGetpwuid(uid_t uid, struct passwd *resultbuf, char *buffer,
                   size_t buflen, struct passwd **result)
@@ -84,6 +85,7 @@ pqGetpwuid(uid_t uid, struct passwd *resultbuf, char *buffer,
 #endif
        return (*result == NULL) ? -1 : 0;
 }
+#endif
 
 /*
  * Wrapper around gethostbyname() or gethostbyname_r() to mimic