mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
Update to Gnulib v0.0-3448-g6078aa4 for its <netdb.h> fix.
Reverts commit 691b9ec196 ("getaddrinfo:
Define macros lacking in NetBSD 5.0.").
* libguile/net_db.c (AI_ALL, AI_V4MAPPED, AI_ADDRCONFIG): Remove
placeholder definitions, how provided by Gnulib's <netdb.h>.
This commit is contained in:
Ludovic Courtès
parent
44d70904a6
commit
dde9c5a431
4 changed files with 49 additions and 29 deletions
|
|
@ -2,7 +2,7 @@
|
|||
# gendocs.sh -- generate a GNU manual in many formats. This script is
|
||||
# mentioned in maintain.texi. See the help message below for usage details.
|
||||
|
||||
scriptversion=2010-01-02.16
|
||||
scriptversion=2010-02-13.20
|
||||
|
||||
# Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
||||
# Free Software Foundation, Inc.
|
||||
|
|
@ -56,6 +56,7 @@ See the GNU Maintainers document for a more extensive discussion:
|
|||
http://www.gnu.org/prep/maintain_toc.html
|
||||
|
||||
Options:
|
||||
-s SRCFILE read Texinfo from SRCFILE, instead of PACKAGE.{texinfo|texi|txi}
|
||||
-o OUTDIR write files into OUTDIR, instead of manual/.
|
||||
--email ADR use ADR as contact in generated web pages.
|
||||
--docbook convert to DocBook too (xml, txt, html, pdf and ps).
|
||||
|
|
@ -119,12 +120,14 @@ PACKAGE=
|
|||
EMAIL=webmasters@gnu.org # please override with --email
|
||||
htmlarg=
|
||||
outdir=manual
|
||||
srcfile=
|
||||
|
||||
while test $# -gt 0; do
|
||||
case $1 in
|
||||
--email) shift; EMAIL=$1;;
|
||||
--help) echo "$usage"; exit 0;;
|
||||
--version) echo "$version"; exit 0;;
|
||||
-s) shift; srcfile=$1;;
|
||||
-o) shift; outdir=$1;;
|
||||
--docbook) docbook=yes;;
|
||||
--html) shift; htmlarg=$1;;
|
||||
|
|
@ -146,7 +149,9 @@ while test $# -gt 0; do
|
|||
shift
|
||||
done
|
||||
|
||||
if test -s "$srcdir/$PACKAGE.texinfo"; then
|
||||
if test -n "$srcfile"; then
|
||||
:
|
||||
elif test -s "$srcdir/$PACKAGE.texinfo"; then
|
||||
srcfile=$srcdir/$PACKAGE.texinfo
|
||||
elif test -s "$srcdir/$PACKAGE.texi"; then
|
||||
srcfile=$srcdir/$PACKAGE.texi
|
||||
|
|
@ -268,13 +273,14 @@ else
|
|||
fi
|
||||
|
||||
echo Making .tar.gz for sources...
|
||||
srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` || true
|
||||
d=`dirname $srcfile`
|
||||
srcfiles=`ls $d/*.texinfo $d/*.texi $d/*.txi $d/*.eps 2>/dev/null` || true
|
||||
tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles
|
||||
texi_tgz_size=`calcsize $outdir/$PACKAGE.texi.tar.gz`
|
||||
|
||||
if test -n "$docbook"; then
|
||||
cmd="$SETLANG $MAKEINFO -o - --docbook \"$srcfile\" > ${srcdir}/$PACKAGE-db.xml"
|
||||
echo "Generating docbook XML... $(cmd)"
|
||||
echo "Generating docbook XML... ($cmd)"
|
||||
eval "$cmd"
|
||||
docbook_xml_size=`calcsize $PACKAGE-db.xml`
|
||||
gzip -f -9 -c $PACKAGE-db.xml >$outdir/$PACKAGE-db.xml.gz
|
||||
|
|
@ -302,7 +308,7 @@ if test -n "$docbook"; then
|
|||
mv $PACKAGE-db.txt $outdir/
|
||||
|
||||
cmd="${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml"
|
||||
echo "Generating docbook PS... $(cmd)"
|
||||
echo "Generating docbook PS... ($cmd)"
|
||||
eval "$cmd"
|
||||
gzip -f -9 -c $PACKAGE-db.ps >$outdir/$PACKAGE-db.ps.gz
|
||||
docbook_ps_gz_size=`calcsize $outdir/$PACKAGE-db.ps.gz`
|
||||
|
|
|
|||
|
|
@ -74,18 +74,24 @@ struct addrinfo
|
|||
# endif
|
||||
|
||||
# if 0
|
||||
/* The commented out definitions below are not yet implemented in the
|
||||
GNULIB getaddrinfo() replacement, so are not yet needed and may, in fact,
|
||||
cause conflicts on systems with a getaddrinfo() function which does not
|
||||
define them.
|
||||
|
||||
If they are restored, be sure to protect the definitions with #ifndef. */
|
||||
# define AI_NUMERICHOST 0x0004 /* Don't use name resolution. */
|
||||
# define AI_V4MAPPED 0x0008 /* IPv4 mapped addresses are acceptable. */
|
||||
# define AI_ALL 0x0010 /* Return IPv4 mapped and IPv6 addresses. */
|
||||
# define AI_ADDRCONFIG 0x0020 /* Use configuration of this host to choose
|
||||
returned address type.. */
|
||||
# endif /* 0 */
|
||||
# endif
|
||||
|
||||
/* These symbolic constants are required to be present by POSIX, but
|
||||
our getaddrinfo replacement doesn't use them (yet). Setting them
|
||||
to 0 on systems that doesn't have them avoids causing problems for
|
||||
system getaddrinfo implementations that would be confused by
|
||||
unknown values. */
|
||||
# ifndef AI_V4MAPPED
|
||||
# define AI_V4MAPPED 0 /* 0x0008: IPv4 mapped addresses are acceptable. */
|
||||
# endif
|
||||
# ifndef AI_ALL
|
||||
# define AI_ALL 0 /* 0x0010: Return IPv4 mapped and IPv6 addresses. */
|
||||
# endif
|
||||
# ifndef AI_ADDRCONFIG
|
||||
# define AI_ADDRCONFIG 0 /* 0x0020: Use configuration of this host to choose
|
||||
returned address type. */
|
||||
# endif
|
||||
|
||||
/* Error values for `getaddrinfo' function. */
|
||||
# ifndef EAI_BADFLAGS
|
||||
|
|
|
|||
|
|
@ -73,17 +73,6 @@ extern int h_errno;
|
|||
extern const char *hstrerror (int);
|
||||
#endif
|
||||
|
||||
/* NetBSD 5.0 lacks the following flags. */
|
||||
#ifndef AI_ALL
|
||||
# define AI_ALL 0
|
||||
#endif
|
||||
#ifndef AI_V4MAPPED
|
||||
# define AI_V4MAPPED 0
|
||||
#endif
|
||||
#ifndef AI_ADDRCONFIG
|
||||
# define AI_ADDRCONFIG 0
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
SCM_SYMBOL (scm_host_not_found_key, "host-not-found");
|
||||
|
|
|
|||
23
maint.mk
23
maint.mk
|
|
@ -125,7 +125,9 @@ local-checks-available = \
|
|||
|
||||
# Arrange to print the name of each syntax-checking rule just before running it.
|
||||
$(syntax-check-rules): %: %.m
|
||||
$(patsubst %, %.m, $(syntax-check-rules)):
|
||||
sc_m_rules_ = $(patsubst %, %.m, $(syntax-check-rules))
|
||||
.PHONY: $(sc_m_rules_)
|
||||
$(sc_m_rules_):
|
||||
@echo $(patsubst sc_%.m, %, $@)
|
||||
|
||||
local-check := $(filter-out $(local-checks-to-skip), $(local-checks-available))
|
||||
|
|
@ -367,6 +369,22 @@ sc_prohibit_xalloc_without_use:
|
|||
re='\<($(_xa1)|$(_xa2)) *\('\
|
||||
$(_header_without_use)
|
||||
|
||||
# Extract function names:
|
||||
# perl -lne '/^(?:extern )?(?:void|char) \*?(\w+) \(/ and print $1' lib/hash.h
|
||||
_hash_re = \
|
||||
clear|delete|free|get_(first|next)|insert|lookup|print_statistics|reset_tuning
|
||||
_hash_fn = \<($(_hash_re)) *\(
|
||||
_hash_struct = (struct )?\<[Hh]ash_(table|tuning)\>
|
||||
sc_prohibit_hash_without_use:
|
||||
@h='"hash.h"' \
|
||||
re='$(_hash_fn)|$(_hash_struct)'\
|
||||
$(_header_without_use)
|
||||
|
||||
sc_prohibit_hash_pjw_without_use:
|
||||
@h='"hash-pjw.h"' \
|
||||
re='\<hash_pjw *\(' \
|
||||
$(_header_without_use)
|
||||
|
||||
sc_prohibit_safe_read_without_use:
|
||||
@h='"safe-read.h"' re='(\<SAFE_READ_ERROR\>|\<safe_read *\()' \
|
||||
$(_header_without_use)
|
||||
|
|
@ -787,11 +805,12 @@ announcement: NEWS ChangeLog $(rel-files)
|
|||
ftp-gnu = ftp://ftp.gnu.org/gnu
|
||||
www-gnu = http://www.gnu.org
|
||||
|
||||
upload_dest_dir_ ?= $(PACKAGE)
|
||||
emit_upload_commands:
|
||||
@echo =====================================
|
||||
@echo =====================================
|
||||
@echo "$(build_aux)/gnupload $(GNUPLOADFLAGS) \\"
|
||||
@echo " --to $(gnu_rel_host):$(PACKAGE) \\"
|
||||
@echo " --to $(gnu_rel_host):$(upload_dest_dir_) \\"
|
||||
@echo " $(rel-files)"
|
||||
@echo '# send the ~/announce-$(my_distdir) e-mail'
|
||||
@echo =====================================
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue