diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-04-23 09:18:51 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-04-23 09:18:51 +0200 |
| commit | ad0abd26d83dc3a0a180c1f63f29f803076974cf (patch) | |
| tree | 369f6d60eaf3ab5df46448f87d2c675acdca4d5a | |
| parent | c3c5e456fbaca5a7dd4a4b90d86993ab043f5e1e (diff) | |
| download | gnutls-ad0abd26d83dc3a0a180c1f63f29f803076974cf.tar.gz | |
Update gnulib files.
| -rw-r--r-- | gl/gnulib.mk | 1 | ||||
| -rw-r--r-- | lgl/sys_socket.in.h | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gl/gnulib.mk b/gl/gnulib.mk index 00c3270f34..fe4f35bb7a 100644 --- a/gl/gnulib.mk +++ b/gl/gnulib.mk @@ -30,6 +30,7 @@ BUILT_SOURCES += $(ARPA_INET_H) # doesn't have one. arpa/inet.h: @MKDIR_P@ arpa + rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed \ -e 's|@''GNULIB_INET_NTOP''@|$(GNULIB_INET_NTOP)|g' \ diff --git a/lgl/sys_socket.in.h b/lgl/sys_socket.in.h index 910c9ae781..c1ee70d029 100644 --- a/lgl/sys_socket.in.h +++ b/lgl/sys_socket.in.h @@ -103,7 +103,13 @@ # endif # if defined _WIN32 || defined __WIN32__ -# define setsockopt(a,b,c,d,e) setsockopt(a,b,c,(const void*)(d),e) +# define setsockopt(a,b,c,d,e) rpl_setsockopt(a,b,c,d,e) +static inline int +rpl_setsockopt(int socket, int level, int optname, const void *optval, + socklen_t optlen) +{ + return (setsockopt)(socket, level, optname, optval, optlen); +} # endif #endif /* HAVE_SYS_SOCKET_H */ |