Win32 build cleanups, from Andrew Dunstan.

Neil Conway · Neil Conway · commit 2fa36d7e4148 · 2004-11-17T08:30:11.000Z
diff --git 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
@@ -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
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.439 2004/11/17 00:14:12 tgl Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.440 2004/11/17 08:30:09 neilc Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -4037,7 +4037,7 @@ win32_waitpid(int *exitstatus)`
`4037`	`4037`	`*/`
`4038`	`4038`	`ereport(FATAL,`
`4039`	`4039`	`(errmsg_internal("failed to get exit code for child %lu",`
`4040`		`- (DWORD)win32_childPIDArray[index])));`
	`4040`	`+ (unsigned long) win32_childPIDArray[index])));`
`4041`	`4041`	`}`
`4042`	`4042`	`*exitstatus = (int) exitCode;`
`4043`	`4043`	`return win32_childPIDArray[index];`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/port/open.c,v 1.5 2004/10/17 23:53:30 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/port/open.c,v 1.6 2004/11/17 08:30:11 neilc Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -18,6 +18,8 @@`
`18`	`18`	`#include <errno.h>`
`19`	`19`	`#include <assert.h>`
`20`	`20`
	`21`	`+int win32_open(const char *fileName, int fileFlags, ...);`
	`22`	`+`
`21`	`23`	`static int`
`22`	`24`	`openFlagsToCreateFileFlags(int openFlags)`
`23`	`25`	`{`