projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from texinfo
[gnulib.git]
/
lib
/
sys_socket.in.h
diff --git
a/lib/sys_socket.in.h
b/lib/sys_socket.in.h
index
b703200
..
6508bf7
100644
(file)
--- a/
lib/sys_socket.in.h
+++ b/
lib/sys_socket.in.h
@@
-1,6
+1,6
@@
/* Provide a sys/socket header file for systems lacking it (read: MinGW)
and for systems where it is incomplete.
/* Provide a sys/socket header file for systems lacking it (read: MinGW)
and for systems where it is incomplete.
- Copyright (C) 2005-200
8
Free Software Foundation, Inc.
+ Copyright (C) 2005-200
9
Free Software Foundation, Inc.
Written by Simon Josefsson.
This program is free software; you can redistribute it and/or modify
Written by Simon Josefsson.
This program is free software; you can redistribute it and/or modify
@@
-120,9
+120,9
@@
extern "C" {
/* Re-define FD_ISSET to avoid a WSA call while we are not using
network sockets. */
static inline int
/* Re-define FD_ISSET to avoid a WSA call while we are not using
network sockets. */
static inline int
-rpl_fd_isset (
int
fd, fd_set * set)
+rpl_fd_isset (
SOCKET
fd, fd_set * set)
{
{
- int i;
+
u_
int i;
if (set == NULL)
return 0;
if (set == NULL)
return 0;
@@
-145,6
+145,11
@@
rpl_fd_isset (int fd, fd_set * set)
# define close close_used_without_including_unistd_h
# endif
# define close close_used_without_including_unistd_h
# endif
+# if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H
+# undef gethostname
+# define gethostname gethostname_used_without_including_unistd_h
+# endif
+
# if @GNULIB_SOCKET@
# if @HAVE_WINSOCK2_H@
# undef socket
# if @GNULIB_SOCKET@
# if @HAVE_WINSOCK2_H@
# undef socket
@@
-251,7
+256,7
@@
extern int rpl_getsockname (int, struct sockaddr *, int *);
# if @HAVE_WINSOCK2_H@
# undef getsockopt
# define getsockopt rpl_getsockopt
# if @HAVE_WINSOCK2_H@
# undef getsockopt
# define getsockopt rpl_getsockopt
-extern int rpl_getsockopt (int, int, int, void *,
in
t *);
+extern int rpl_getsockopt (int, int, int, void *,
socklen_
t *);
# endif
# elif @HAVE_WINSOCK2_H@
# undef getsockopt
# endif
# elif @HAVE_WINSOCK2_H@
# undef getsockopt
@@
-353,7
+358,7
@@
extern int rpl_sendto (int, const void *, int, int, struct sockaddr *, int);
# if @HAVE_WINSOCK2_H@
# undef setsockopt
# define setsockopt rpl_setsockopt
# if @HAVE_WINSOCK2_H@
# undef setsockopt
# define setsockopt rpl_setsockopt
-extern int rpl_setsockopt (int, int, int, const void *,
in
t);
+extern int rpl_setsockopt (int, int, int, const void *,
socklen_
t);
# endif
# elif @HAVE_WINSOCK2_H@
# undef setsockopt
# endif
# elif @HAVE_WINSOCK2_H@
# undef setsockopt
@@
-388,12
+393,6
@@
extern int rpl_shutdown (int, int);
# define select select_used_without_including_sys_select_h
# endif
# define select select_used_without_including_sys_select_h
# endif
-# if @GNULIB_CLOSE@ && @HAVE_WINSOCK2_H@
-/* gnulib internal function. */
-# define HAVE__GL_CLOSE_FD_MAYBE_SOCKET 1
-extern int _gl_close_fd_maybe_socket (int fd);
-# endif
-
# ifdef __cplusplus
}
# endif
# ifdef __cplusplus
}
# endif