diff options
author | Andy Wingo <wingo@pobox.com> | 2011-10-27 13:45:04 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-10-27 13:45:04 +0200 |
commit | 4938d3cb742de2a356586c55e5af32e193c5990b (patch) | |
tree | b4bfe0fd26e102c5fa38ca9965bc4ebdbae8e3b4 /lib/w32sock.h | |
parent | 9d013330154852bc2309947adaa30b32418642c0 (diff) | |
parent | 2be3feb17e5456bba71749e0e97adf45c32c4e0e (diff) | |
download | guile-4938d3cb742de2a356586c55e5af32e193c5990b.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
GUILE-VERSION
libguile/deprecated.c
libguile/gc-malloc.c
module/language/tree-il/peval.scm
Diffstat (limited to 'lib/w32sock.h')
-rw-r--r-- | lib/w32sock.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/w32sock.h b/lib/w32sock.h index 28b0f829c..20cb7c3a3 100644 --- a/lib/w32sock.h +++ b/lib/w32sock.h @@ -22,9 +22,12 @@ /* Get O_RDWR and O_BINARY. */ #include <fcntl.h> -/* Get _get_osfhandle() and _open_osfhandle(). */ +/* Get _open_osfhandle(). */ #include <io.h> +/* Get _get_osfhandle(). */ +#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)) |