# HG changeset patch # User Marc-André Lureau # Date 1327753411 -3600 # Node ID 067aa8df247afe8e4edeb1ea0e1d635e92d62683 # Parent 67d40006deab6228079aebb1f59a212b3579054d accept4, fcntl, socket modules: Avoid warnings on x86_64 mingw64. * lib/accept4.c (accept4): Use intptr_t to convert handle pointer to an integer. * lib/fcntl.c (dupfd): Likewise. * lib/w32sock.h (SOCKET_TO_FD): Likewise. diff -r 67d40006deab -r 067aa8df247a ChangeLog --- a/ChangeLog Sat Jan 28 13:15:36 2012 +0100 +++ b/ChangeLog Sat Jan 28 13:23:31 2012 +0100 @@ -1,3 +1,11 @@ +2012-01-28 Marc-André Lureau (tiny change) + + accept4, fcntl, socket modules: Avoid warnings on x86_64 mingw64. + * lib/accept4.c (accept4): Use intptr_t to convert handle pointer to + an integer. + * lib/fcntl.c (dupfd): Likewise. + * lib/w32sock.h (SOCKET_TO_FD): Likewise. + 2012-01-28 Bruno Haible fcntl: Avoid compilation error on native Windows. diff -r 67d40006deab -r 067aa8df247a lib/accept4.c --- a/lib/accept4.c Sat Jan 28 13:15:36 2012 +0100 +++ b/lib/accept4.c Sat Jan 28 13:23:31 2012 +0100 @@ -91,7 +91,7 @@ /* Closing fd before allocating the new fd ensures that the new fd will have the minimum possible value. */ close (fd); - nfd = _open_osfhandle ((long) new_handle, + nfd = _open_osfhandle ((intptr_t) new_handle, O_NOINHERIT | (flags & (O_TEXT | O_BINARY))); if (nfd < 0) { diff -r 67d40006deab -r 067aa8df247a lib/fcntl.c --- a/lib/fcntl.c Sat Jan 28 13:15:36 2012 +0100 +++ b/lib/fcntl.c Sat Jan 28 13:23:31 2012 +0100 @@ -94,7 +94,7 @@ result = -1; break; } - duplicated_fd = _open_osfhandle ((long) new_handle, flags); + duplicated_fd = _open_osfhandle ((intptr_t) new_handle, flags); if (duplicated_fd < 0) { CloseHandle (new_handle); diff -r 67d40006deab -r 067aa8df247a lib/w32sock.h --- a/lib/w32sock.h Sat Jan 28 13:15:36 2012 +0100 +++ b/lib/w32sock.h Sat Jan 28 13:23:31 2012 +0100 @@ -29,7 +29,7 @@ #include "msvc-nothrow.h" #define FD_TO_SOCKET(fd) ((SOCKET) _get_osfhandle ((fd))) -#define SOCKET_TO_FD(fh) (_open_osfhandle ((long) (fh), O_RDWR | O_BINARY)) +#define SOCKET_TO_FD(fh) (_open_osfhandle ((intptr_t) (fh), O_RDWR | O_BINARY)) static inline void set_winsock_errno (void)