# HG changeset patch # User Karl Berry # Date 1058272926 0 # Node ID 989c518b5eecc0e298081d4a6b43b9d6daa2a658 # Parent 70180b800ad14ae7da983bda41b593898d3f1520 karl srclist envvars, vasnprintf diff --git a/config/srclistvars.sh b/config/srclistvars.sh --- a/config/srclistvars.sh +++ b/config/srclistvars.sh @@ -1,4 +1,4 @@ -# $Id: srclistvars.sh,v 1.9 2003-07-14 22:44:04 eggert Exp $ +# $Id: srclistvars.sh,v 1.10 2003-07-15 12:42:06 karl Exp $ # Variables for srclist-update and srclist.txt. # Will change for each user. @@ -11,17 +11,21 @@ : ${GNUORG=../gnuorg} : ${LIBCSRC=../libc} : ${TEXINFOSRC=../texinfo} -esac + ;; -: ${ACLOCAL=/usr/local/gnu/share/aclocal} -: ${AUTOCONF=/usr/local/gnu/share/autoconf} -: ${AUTOMAKE=$HOME/gnu/src/automake} -: ${EMACSSRC=$HOME/gnu/src/emacs} -: ${GETTEXT=/usr/local/gnu/share/gettext} -: ${GNUBIN=/usr/local/gnu/bin} -: ${GNUCONFIG=$HOME/gnu/src/ftp.gnu.org/pub/gnu/config} -: ${GNULIBSRC=$HOME/gnu/src/gnulib} -: ${GNUORG=$HOME/gnu/gnuorg} -: ${LIBCSRC=$HOME/gnu/src/libc} -: ${TEXINFOSRC=/u/texinfo/src} -: ${TEXMFROOT=/usr/local/texmf/texmf} +karl) + : ${ACLOCAL=/usr/local/gnu/share/aclocal} + : ${AUTOCONF=/usr/local/gnu/share/autoconf} + : ${AUTOMAKE=$HOME/gnu/src/automake} + : ${EMACSSRC=$HOME/gnu/src/emacs} + : ${GETTEXT=$HOME/gnu/src/gettext} + : ${GNUBIN=/usr/local/gnu/bin} + : ${GNUCONFIG=$HOME/gnu/src/ftp.gnu.org/pub/gnu/config} + : ${GNULIBSRC=$HOME/gnu/src/gnulib} + : ${GNUORG=$HOME/gnu/gnuorg} + : ${LIBCSRC=$HOME/gnu/src/libc} + : ${TEXINFOSRC=/u/texinfo/src} + : ${TEXMFROOT=/usr/local/texmf/texmf} + ;; + +esac diff --git a/lib/ChangeLog b/lib/ChangeLog --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2003-07-15 + + * vasnprintf.c: update from gettext. + 2003-07-15 Jim Meyering * makepath.c (make_path): Enclose diagnostic in _(...). diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -39,12 +39,12 @@ #include "printf-parse.h" /* For those losing systems which don't have 'alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA + some additional code emulating it. */ +#ifdef HAVE_ALLOCA # define freea(p) /* nothing */ #else -# define alloca(n) malloc (n) -# define freea(p) free (p) +# define alloca(n) malloc (n) +# define freea(p) free (p) #endif char * @@ -509,7 +509,7 @@ retcount = 0; #if HAVE_SNPRINTF -# define SNPRINTF_BUF(arg) \ +#define SNPRINTF_BUF(arg) \ switch (prefix_count) \ { \ case 0: \ @@ -529,7 +529,7 @@ abort (); \ } #else -# define SNPRINTF_BUF(arg) \ +#define SNPRINTF_BUF(arg) \ switch (prefix_count) \ { \ case 0: \