diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-05-03 17:21:23 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-05-03 17:21:23 +0000 |
| commit | 0d8f242f24562c4aa22c698e9a0e7002b047aac6 (patch) | |
| tree | 320d5fe34e36a1ecdae6a2ee9366580841baeb1f /gl | |
| parent | 8665cc3df8b3b914d54dbcada6d1bd757de0d2f4 (diff) | |
| download | gnutls-0d8f242f24562c4aa22c698e9a0e7002b047aac6.tar.gz | |
Update.
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/gnulib.mk | 6 | ||||
| -rw-r--r-- | gl/m4/gnulib-comp.m4 | 2 | ||||
| -rw-r--r-- | gl/m4/socklen.m4 | 2 | ||||
| -rw-r--r-- | gl/string_.h | 4 | ||||
| -rw-r--r-- | gl/sys_socket_.h (renamed from gl/socket_.h) | 0 |
5 files changed, 7 insertions, 7 deletions
diff --git a/gl/gnulib.mk b/gl/gnulib.mk index 55267f26c9..0a3434b8d9 100644 --- a/gl/gnulib.mk +++ b/gl/gnulib.mk @@ -238,20 +238,20 @@ BUILT_SOURCES += $(SYS_SOCKET_H) # We need the following in order to create <sys/socket.h> when the system # doesn't have one that works with the given compiler. -sys/socket.h: socket_.h +sys/socket.h: sys_socket_.h @MKDIR_P@ sys { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''ABSOLUTE_SYS_SOCKET_H''@|$(ABSOLUTE_SYS_SOCKET_H)|g' \ -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ - < $(srcdir)/socket_.h; \ + < $(srcdir)/sys_socket_.h; \ } > $@-t mv -f $@-t $@ MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t MOSTLYCLEANDIRS += sys -EXTRA_DIST += socket_.h +EXTRA_DIST += sys_socket_.h ## end gnulib module sys_socket diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4 index fab8c2aabb..512406418c 100644 --- a/gl/m4/gnulib-comp.m4 +++ b/gl/m4/gnulib-comp.m4 @@ -130,10 +130,10 @@ AC_DEFUN([gl_FILE_LIST], [ lib/progname.h lib/readline.c lib/readline.h - lib/socket_.h lib/stdbool_.h lib/strdup.c lib/string_.h + lib/sys_socket_.h lib/version-etc-fsf.c lib/version-etc.c lib/version-etc.h diff --git a/gl/m4/socklen.m4 b/gl/m4/socklen.m4 index e824a09f56..d39a314e17 100644 --- a/gl/m4/socklen.m4 +++ b/gl/m4/socklen.m4 @@ -12,7 +12,7 @@ dnl types for the argument to getsockopt, getpeername, etc. So we dnl have to test to find something that will work. dnl On mingw32, socklen_t is in ws2tcpip.h ('int'), so we try to find -dnl it there first. That file is included by gnulib's socket_.h, which +dnl it there first. That file is included by gnulib's sys_socket_.h, which dnl all users of this module should include. Cygwin must not include dnl ws2tcpip.h. AC_DEFUN([gl_TYPE_SOCKLEN_T], diff --git a/gl/string_.h b/gl/string_.h index a7c0c23f4a..95888635c2 100644 --- a/gl/string_.h +++ b/gl/string_.h @@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef __DECC +#if defined __DECC && __DECC_VER >= 60000000 # include_next <string.h> #endif @@ -29,7 +29,7 @@ # pragma GCC system_header #endif -#ifndef __DECC +#if !(defined __DECC && __DECC_VER >= 60000000) # include @ABSOLUTE_STRING_H@ #endif diff --git a/gl/socket_.h b/gl/sys_socket_.h index 623c98c2f1..623c98c2f1 100644 --- a/gl/socket_.h +++ b/gl/sys_socket_.h |