Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 13c5fdb

Browse files
committed
Fix one more cast for _open_osfhandle().
Tsutomu Yamada
1 parent f509944 commit 13c5fdb

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/backend/postmaster/postmaster.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* 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 $
4141
*
4242
* NOTES
4343
*
@@ -403,7 +403,11 @@ typedef struct
403403
int ListenSocket[MAXLISTEN];
404404
long MyCancelKey;
405405
int MyPMChildSlot;
406+
#ifndef WIN32
406407
unsigned long UsedShmemSegID;
408+
#else
409+
HANDLE UsedShmemSegID;
410+
#endif
407411
void *UsedShmemSegAddr;
408412
slock_t *ShmemLock;
409413
VariableCache ShmemVariableCache;

src/backend/postmaster/syslogger.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
*
2020
* 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 $
2222
*
2323
*-------------------------------------------------------------------------
2424
*/
@@ -573,7 +573,7 @@ SysLogger_Start(void)
573573
* chunking protocol.
574574
*/
575575
fflush(stderr);
576-
fd = _open_osfhandle((long) syslogPipe[1],
576+
fd = _open_osfhandle((intptr_t) syslogPipe[1],
577577
_O_APPEND | _O_BINARY);
578578
if (dup2(fd, _fileno(stderr)) < 0)
579579
ereport(FATAL,

0 commit comments

Comments
 (0)