Fix one more cast for _open_osfhandle().

mhagander · mhagander · commit 13c5fdb5c8f8 · 2010-01-02T12:01:29.000Z
Tsutomu Yamada
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.597 2009/12/19 01:32:34 sriggs Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.598 2010/01/02 12:01:29 mha Exp $
  *
  * NOTES
  *
@@ -403,7 +403,11 @@ typedef struct
 	int			ListenSocket[MAXLISTEN];
 	long		MyCancelKey;
 	int			MyPMChildSlot;
+#ifndef WIN32
 	unsigned long UsedShmemSegID;
+#else
+	 HANDLE		UsedShmemSegID;
+#endif
 	void	   *UsedShmemSegAddr;
 	slock_t    *ShmemLock;
 	VariableCache ShmemVariableCache;
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
@@ -18,7 +18,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.53 2009/11/19 02:45:33 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.54 2010/01/02 12:01:29 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -573,7 +573,7 @@ SysLogger_Start(void)
 				 * chunking protocol.
 				 */
 				fflush(stderr);
-				fd = _open_osfhandle((long) syslogPipe[1],
+				fd = _open_osfhandle((intptr_t) syslogPipe[1],
 									 _O_APPEND | _O_BINARY);
 				if (dup2(fd, _fileno(stderr)) < 0)
 					ereport(FATAL,

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.597 2009/12/19 01:32:34 sriggs Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.598 2010/01/02 12:01:29 mha Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -403,7 +403,11 @@ typedef struct`
`403`	`403`	`int ListenSocket[MAXLISTEN];`
`404`	`404`	`long MyCancelKey;`
`405`	`405`	`int MyPMChildSlot;`
	`406`	`+#ifndef WIN32`
`406`	`407`	`unsigned long UsedShmemSegID;`
	`408`	`+#else`
	`409`	`+ HANDLE UsedShmemSegID;`
	`410`	`+#endif`
`407`	`411`	`void *UsedShmemSegAddr;`
`408`	`412`	`slock_t *ShmemLock;`
`409`	`413`	`VariableCache ShmemVariableCache;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`*`
`20`	`20`	`* IDENTIFICATION`
`21`		`- * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.53 2009/11/19 02:45:33 tgl Exp $`
	`21`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.54 2010/01/02 12:01:29 mha Exp $`
`22`	`22`	`*`
`23`	`23`	`*-------------------------------------------------------------------------`
`24`	`24`	`*/`
`@@ -573,7 +573,7 @@ SysLogger_Start(void)`
`573`	`573`	`* chunking protocol.`
`574`	`574`	`*/`
`575`	`575`	`fflush(stderr);`
`576`		`- fd = _open_osfhandle((long) syslogPipe[1],`
	`576`	`+ fd = _open_osfhandle((intptr_t) syslogPipe[1],`
`577`	`577`	`_O_APPEND \| _O_BINARY);`
`578`	`578`	`if (dup2(fd, _fileno(stderr)) < 0)`
`579`	`579`	`ereport(FATAL,`