projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS.stable: log cherry-pick [79aac72]->[cc1a9b7] canonicalize-lgpl: use common idiom
[gnulib.git]
/
lib
/
socket.c
diff --git
a/lib/socket.c
b/lib/socket.c
index
f14906a
..
af6be25
100644
(file)
--- a/
lib/socket.c
+++ b/
lib/socket.c
@@
-1,6
+1,6
@@
/* socket.c --- wrappers for Windows socket function
/* socket.c --- wrappers for Windows socket function
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008
-2011
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-26,14
+26,18
@@
/* Get set_winsock_errno, FD_TO_SOCKET etc. */
#include "w32sock.h"
/* Get set_winsock_errno, FD_TO_SOCKET etc. */
#include "w32sock.h"
-#
undef socket
+#
include "sockets.h"
int
rpl_socket (int domain, int type, int protocol)
{
int
rpl_socket (int domain, int type, int protocol)
{
+ SOCKET fh;
+
+ gl_sockets_startup (SOCKETS_1_1);
+
/* We have to use WSASocket() to create non-overlapped IO sockets.
Overlapped IO sockets cannot be used with read/write. */
/* We have to use WSASocket() to create non-overlapped IO sockets.
Overlapped IO sockets cannot be used with read/write. */
-
SOCKET
fh = WSASocket (domain, type, protocol, NULL, 0, 0);
+ fh = WSASocket (domain, type, protocol, NULL, 0, 0);
if (fh == INVALID_SOCKET)
{
if (fh == INVALID_SOCKET)
{