aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Conway <neilc@samurai.com>2004-11-17 08:30:11 +0000
committerNeil Conway <neilc@samurai.com>2004-11-17 08:30:11 +0000
commit2fa36d7e414870e5d0bec36f4fbe9fbca34f0ca5 (patch)
tree5dcdeffa87f5ffe5e352180d924f3c9a95009a8b
parentffe130f52e126ec0710d266635117903db5676f3 (diff)
downloadpostgresql-2fa36d7e414870e5d0bec36f4fbe9fbca34f0ca5.tar.gz
postgresql-2fa36d7e414870e5d0bec36f4fbe9fbca34f0ca5.zip
Win32 build cleanups, from Andrew Dunstan.
-rw-r--r--src/backend/port/dynloader/win32.c7
-rw-r--r--src/backend/postmaster/postmaster.c4
-rw-r--r--src/port/open.c4
3 files changed, 11 insertions, 4 deletions
diff --git a/src/backend/port/dynloader/win32.c b/src/backend/port/dynloader/win32.c
index 772cfaba119..16a38b99b0e 100644
--- a/src/backend/port/dynloader/win32.c
+++ b/src/backend/port/dynloader/win32.c
@@ -1,7 +1,12 @@
-/* $PostgreSQL: pgsql/src/backend/port/dynloader/win32.c,v 1.3 2003/11/29 19:51:54 pgsql Exp $ */
+/* $PostgreSQL: pgsql/src/backend/port/dynloader/win32.c,v 1.4 2004/11/17 08:30:08 neilc Exp $ */
#include <windows.h>
+char *dlerror(void);
+int dlclose(void *handle);
+void *dlsym(void *handle, const char *symbol);
+void *dlopen(const char *path, int mode);
+
char *
dlerror(void)
{
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index a8e22cbd8ee..2e19693b2d4 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.439 2004/11/17 00:14:12 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.440 2004/11/17 08:30:09 neilc Exp $
*
* NOTES
*
@@ -4037,7 +4037,7 @@ win32_waitpid(int *exitstatus)
*/
ereport(FATAL,
(errmsg_internal("failed to get exit code for child %lu",
- (DWORD)win32_childPIDArray[index])));
+ (unsigned long) win32_childPIDArray[index])));
}
*exitstatus = (int) exitCode;
return win32_childPIDArray[index];
diff --git a/src/port/open.c b/src/port/open.c
index 34fd95e6709..0715f39bf4c 100644
--- a/src/port/open.c
+++ b/src/port/open.c
@@ -6,7 +6,7 @@
*
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/port/open.c,v 1.5 2004/10/17 23:53:30 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/open.c,v 1.6 2004/11/17 08:30:11 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,6 +18,8 @@
#include <errno.h>
#include <assert.h>
+int win32_open(const char *fileName, int fileFlags, ...);
+
static int
openFlagsToCreateFileFlags(int openFlags)
{