diff options
| -rw-r--r-- | gl/Makefile.am | 1 | ||||
| -rw-r--r-- | gl/m4/getline.m4 | 6 | ||||
| -rw-r--r-- | gl/m4/getpass.m4 | 6 | ||||
| -rw-r--r-- | gl/progname.c | 4 | ||||
| -rw-r--r-- | gl/size_max.h | 8 | ||||
| -rw-r--r-- | gl/vasnprintf.c | 7 |
6 files changed, 20 insertions, 12 deletions
diff --git a/gl/Makefile.am b/gl/Makefile.am index fa1376c529..ee6af6a201 100644 --- a/gl/Makefile.am +++ b/gl/Makefile.am @@ -42,7 +42,6 @@ MOSTLYCLEANFILES += alloca.h alloca.h-t ## begin gnulib module getline -libgnu_la_SOURCES += getline.h EXTRA_DIST += getndelim2.h getndelim2.c ## end gnulib module getline diff --git a/gl/m4/getline.m4 b/gl/m4/getline.m4 index 2b5aaabcd6..983f261463 100644 --- a/gl/m4/getline.m4 +++ b/gl/m4/getline.m4 @@ -1,6 +1,6 @@ -# getline.m4 serial 11 +# getline.m4 serial 12 -dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software +dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 Free Software dnl Foundation, Inc. dnl dnl This file is free software; the Free Software Foundation @@ -15,6 +15,8 @@ dnl have a function by that name in -linet that doesn't have anything dnl to do with the function we need. AC_DEFUN([AM_FUNC_GETLINE], [ + AC_LIBSOURCES([getline.c, getline.h]) + dnl Persuade glibc <stdio.h> to declare getline() and getdelim(). AC_REQUIRE([AC_GNU_SOURCE]) diff --git a/gl/m4/getpass.m4 b/gl/m4/getpass.m4 index d48534c573..29d15e8844 100644 --- a/gl/m4/getpass.m4 +++ b/gl/m4/getpass.m4 @@ -1,5 +1,5 @@ -# getpass.m4 serial 5 -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +# getpass.m4 serial 6 +dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,6 +18,8 @@ AC_DEFUN([gl_FUNC_GETPASS], # arbitrary length (not just 8 bytes as on HP-UX). AC_DEFUN([gl_FUNC_GETPASS_GNU], [ + AC_LIBSOURCES([getpass.c, getpass.h]) + AC_CHECK_DECLS_ONCE(getpass) dnl TODO: Detect when GNU getpass() is already found in glibc. AC_LIBOBJ(getpass) diff --git a/gl/progname.c b/gl/progname.c index 8453706c93..9917efa9ce 100644 --- a/gl/progname.c +++ b/gl/progname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2003 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software; you can redistribute it and/or modify @@ -31,7 +31,7 @@ /* String containing name the program is called with. To be initialized by main(). */ -const char *program_name; +const char *program_name = NULL; /* Set program_name, based on argv[0]. */ void diff --git a/gl/size_max.h b/gl/size_max.h index dcce48efc1..80dfbc924e 100644 --- a/gl/size_max.h +++ b/gl/size_max.h @@ -3,16 +3,16 @@ Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ diff --git a/gl/vasnprintf.c b/gl/vasnprintf.c index ff80857305..c2baeb691b 100644 --- a/gl/vasnprintf.c +++ b/gl/vasnprintf.c @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2004 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -51,6 +51,11 @@ /* Checked size_t computations. */ #include "xsize.h" +/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */ +#ifndef EOVERFLOW +# define EOVERFLOW E2BIG +#endif + #ifdef HAVE_WCHAR_T # ifdef HAVE_WCSLEN # define local_wcslen wcslen |