For src/backend/postmaster/postmaster.c and src/include/c.h (Note: should ioctlsocket_ret be initialized to 1 for BEOS too, and can it take an unsigned parameter? If so, could simplify.)
--- WE HAVE MOVED - PLEASE NOTE OUR NEW CONTACT DETAILS: THE BASEMENT, 33 EWELL STREET, BALMAIN NSW 2041 TEL: +61 2 9555 1544 FAX: +61 2 9555 6911 Certain disclaimers and policies apply to all email sent from Memetrics. For the full text of these disclaimers and policies see http://www.memetrics.com/emailpolicy.html
Index: src/backend/postmaster/postmaster.c =================================================================== RCS file: /projects/cvsroot/pgsql-server/src/backend/postmaster/postmaster.c,v retrieving revision 1.341.2.1 diff -c -2 -r1.341.2.1 postmaster.c *** src/backend/postmaster/postmaster.c 7 Sep 2003 04:36:53 -0000 1.341.2.1 --- src/backend/postmaster/postmaster.c 3 Nov 2003 05:09:26 -0000 *************** *** 215,221 **** /* For FNCTL_NONBLOCK */ ! #if defined(WIN32) || defined(__BEOS__) long ioctlsocket_ret; #endif /* list of library:init-function to be preloaded */ --- 215,225 ---- /* For FNCTL_NONBLOCK */ ! #if defined(WIN32) ! unsigned long ioctlsocket_ret = 1; ! #endif ! #if defined(__BEOS__) long ioctlsocket_ret; #endif + /* list of library:init-function to be preloaded */
Index: src/include/c.h =================================================================== RCS file: /projects/cvsroot/pgsql-server/src/include/c.h,v retrieving revision 1.152 diff -c -2 -r1.152 c.h *** src/include/c.h 4 Aug 2003 02:40:10 -0000 1.152 --- src/include/c.h 3 Nov 2003 05:12:10 -0000 *************** *** 707,717 **** #define FCNTL_NONBLOCK(sock) fcntl(sock, F_SETFL, O_NONBLOCK) #else - extern long ioctlsocket_ret; /* Returns non-0 on failure, while fcntl() returns -1 on failure */ #ifdef WIN32 #define FCNTL_NONBLOCK(sock) ((ioctlsocket(sock, FIONBIO, &ioctlsocket_ret) == 0) ? 0 : -1) #endif #ifdef __BEOS__ #define FCNTL_NONBLOCK(sock) ((ioctl(sock, FIONBIO, &ioctlsocket_ret) == 0) ? 0 : -1) #endif --- 707,718 ---- #define FCNTL_NONBLOCK(sock) fcntl(sock, F_SETFL, O_NONBLOCK) #else /* Returns non-0 on failure, while fcntl() returns -1 on failure */ #ifdef WIN32 + extern unsigned long ioctlsocket_ret; #define FCNTL_NONBLOCK(sock) ((ioctlsocket(sock, FIONBIO, &ioctlsocket_ret) == 0) ? 0 : -1) #endif #ifdef __BEOS__ + extern long ioctlsocket_ret; #define FCNTL_NONBLOCK(sock) ((ioctl(sock, FIONBIO, &ioctlsocket_ret) == 0) ? 0 : -1) #endif
---------------------------(end of broadcast)--------------------------- TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]
