From 6bce7636fbce453498c8c5b14f036b2e19de6d22 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 2 Oct 2007 00:35:36 +0200 Subject: [PATCH] Rename sys_socket_.h to sys_socket.in.h. --- ChangeLog | 3 +++ lib/{sys_socket_.h => sys_socket.in.h} | 0 m4/socklen.m4 | 4 ++-- modules/sys_socket | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) rename lib/{sys_socket_.h => sys_socket.in.h} (100%) diff --git a/ChangeLog b/ChangeLog index 5dc8183cf..7ab1290e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,9 @@ * lib/sys_select.in.h: Renamed from lib/sys_select_.h. * modules/sys_select (Files, Makefile.am): Use sys_select.in.h instead of sys_select_.h. Add dependency. + * lib/sys_socket.in.h: Renamed from lib/sys_socket_.h. + * modules/sys_socket (Files, Makefile.am): Use sys_socket.in.h instead + of sys_socket_.h. 2007-09-30 Bruno Haible diff --git a/lib/sys_socket_.h b/lib/sys_socket.in.h similarity index 100% rename from lib/sys_socket_.h rename to lib/sys_socket.in.h diff --git a/m4/socklen.m4 b/m4/socklen.m4 index d39a314e1..b755757be 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,4 +1,4 @@ -# socklen.m4 serial 5 +# socklen.m4 serial 6 dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -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 sys_socket_.h, which +dnl it there first. That file is included by gnulib's sys_socket.in.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/modules/sys_socket b/modules/sys_socket index b44e4f10f..0c7b6dbb3 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -2,7 +2,7 @@ Description: A for systems lacking it. Files: -lib/sys_socket_.h +lib/sys_socket.in.h m4/sys_socket_h.m4 m4/sockpfaf.m4 @@ -18,7 +18,7 @@ BUILT_SOURCES += $(SYS_SOCKET_H) # We need the following in order to create when the system # doesn't have one that works with the given compiler. -sys/socket.h: sys_socket_.h +sys/socket.h: sys_socket.in.h @MKDIR_P@ sys { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -26,7 +26,7 @@ sys/socket.h: sys_socket_.h -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)/sys_socket_.h; \ + < $(srcdir)/sys_socket.in.h; \ } > $@-t mv -f $@-t $@ MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t -- 2.11.0