OSDN Git Service

Fix one more cast for _open_osfhandle().
authorMagnus Hagander <magnus@hagander.net>
Sat, 2 Jan 2010 12:01:29 +0000 (12:01 +0000)
committerMagnus Hagander <magnus@hagander.net>
Sat, 2 Jan 2010 12:01:29 +0000 (12:01 +0000)
Tsutomu Yamada

src/backend/postmaster/postmaster.c
src/backend/postmaster/syslogger.c

index 21fc83a..daa7ffc 100644 (file)
@@ -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;
index 0b49a81..bd75762 100644 (file)
@@ -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,