summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2005-05-26 15:11:13 +0000
committerSimon Josefsson <simon@josefsson.org>2005-05-26 15:11:13 +0000
commit2f0e77d5a6be5cdb70f129c347aa4ebea3d5edea (patch)
tree7d2ddd2c7d0b36669990790a0cde8c22ce70686d
parenta3ba0004219d513419319844213ab7d612fc016d (diff)
downloadgnutls-2f0e77d5a6be5cdb70f129c347aa4ebea3d5edea.tar.gz
Update.
-rw-r--r--gl/Makefile.am2
-rw-r--r--gl/alloca_.h2
-rw-r--r--gl/asnprintf.c2
-rw-r--r--gl/error.c2
-rw-r--r--gl/error.h2
-rw-r--r--gl/getline.c2
-rw-r--r--gl/getline.h2
-rw-r--r--gl/getndelim2.c2
-rw-r--r--gl/getndelim2.h2
-rw-r--r--gl/getpass.c2
-rw-r--r--gl/getpass.h10
-rw-r--r--gl/m4/gnulib.m43
-rw-r--r--gl/m4/minmax.m438
-rw-r--r--gl/minmax.h15
-rw-r--r--gl/printf-args.c2
-rw-r--r--gl/printf-args.h2
-rw-r--r--gl/printf-parse.c2
-rw-r--r--gl/printf-parse.h2
-rw-r--r--gl/progname.c2
-rw-r--r--gl/progname.h2
-rw-r--r--gl/snprintf.c2
-rw-r--r--gl/snprintf.h2
-rw-r--r--gl/stdbool_.h2
-rw-r--r--gl/vasnprintf.c2
-rw-r--r--gl/vasnprintf.h2
-rw-r--r--gl/xsize.h2
26 files changed, 78 insertions, 32 deletions
diff --git a/gl/Makefile.am b/gl/Makefile.am
index 0832f8086b..db4ef85191 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -9,7 +9,7 @@
#
# Generated by gnulib-tool.
# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --libtool alloca-opt error getline getpass-gnu minmax progname size_max snprintf stdbool vasnprintf xsize
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --libtool alloca-opt error getline getpass-gnu minmax progname size_max snprintf stdbool vasnprintf xsize
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
diff --git a/gl/alloca_.h b/gl/alloca_.h
index 799037ce09..3e3fdf43f8 100644
--- a/gl/alloca_.h
+++ b/gl/alloca_.h
@@ -15,7 +15,7 @@
You should have received a copy of the GNU 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,
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
/* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
diff --git a/gl/asnprintf.c b/gl/asnprintf.c
index 4881a9238f..1b7f4ba396 100644
--- a/gl/asnprintf.c
+++ b/gl/asnprintf.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/gl/error.c b/gl/error.c
index 6b3662d61d..45698be8da 100644
--- a/gl/error.c
+++ b/gl/error.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
diff --git a/gl/error.h b/gl/error.h
index 8ed63595f2..e5220a2f13 100644
--- a/gl/error.h
+++ b/gl/error.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _ERROR_H
#define _ERROR_H 1
diff --git a/gl/getline.c b/gl/getline.c
index 746d708878..5a7980ec9d 100644
--- a/gl/getline.c
+++ b/gl/getline.c
@@ -15,7 +15,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Jan Brittenson, bson@gnu.ai.mit.edu. */
diff --git a/gl/getline.h b/gl/getline.h
index ee9fc052c1..b58e93f4f3 100644
--- a/gl/getline.h
+++ b/gl/getline.h
@@ -15,7 +15,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU 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. */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef GETLINE_H_
# define GETLINE_H_ 1
diff --git a/gl/getndelim2.c b/gl/getndelim2.c
index aef97807a1..e9f8cb9c53 100644
--- a/gl/getndelim2.c
+++ b/gl/getndelim2.c
@@ -16,7 +16,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Originally written by Jan Brittenson, bson@gnu.ai.mit.edu. */
diff --git a/gl/getndelim2.h b/gl/getndelim2.h
index 39f80cb557..fb0a8c3e89 100644
--- a/gl/getndelim2.h
+++ b/gl/getndelim2.h
@@ -15,7 +15,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef GETNDELIM2_H
#define GETNDELIM2_H 1
diff --git a/gl/getpass.c b/gl/getpass.c
index 4f520aef3b..7367251e27 100644
--- a/gl/getpass.c
+++ b/gl/getpass.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#if HAVE_CONFIG_H
# include <config.h>
diff --git a/gl/getpass.h b/gl/getpass.h
index 6502126497..bdff8754d4 100644
--- a/gl/getpass.h
+++ b/gl/getpass.h
@@ -14,18 +14,18 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef GETPASS_H
-#define GETPASS_H
+# define GETPASS_H
/* Get getpass declaration, if available. */
-#include <unistd.h>
+# include <unistd.h>
-#if defined HAVE_DECL_GETPASS && !HAVE_DECL_GETPASS
+# if defined HAVE_DECL_GETPASS && !HAVE_DECL_GETPASS
/* Read a password of arbitrary length from /dev/tty or stdin. */
char *getpass (const char *prompt);
-#endif
+# endif
#endif /* GETPASS_H */
diff --git a/gl/m4/gnulib.m4 b/gl/m4/gnulib.m4
index 8cc198a781..965983d39a 100644
--- a/gl/m4/gnulib.m4
+++ b/gl/m4/gnulib.m4
@@ -8,7 +8,7 @@
# Generated by gnulib-tool.
#
# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --libtool alloca-opt error getline getpass-gnu minmax progname size_max snprintf stdbool vasnprintf xsize
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --libtool alloca-opt error getline getpass-gnu minmax progname size_max snprintf stdbool vasnprintf xsize
AC_DEFUN([gl_EARLY],
[
@@ -21,6 +21,7 @@ AC_DEFUN([gl_INIT],
gl_ERROR
AM_FUNC_GETLINE
gl_FUNC_GETPASS_GNU
+ gl_MINMAX
gl_SIZE_MAX
gl_FUNC_SNPRINTF
AM_STDBOOL_H
diff --git a/gl/m4/minmax.m4 b/gl/m4/minmax.m4
new file mode 100644
index 0000000000..6c6b72b773
--- /dev/null
+++ b/gl/m4/minmax.m4
@@ -0,0 +1,38 @@
+# minmax.m4 serial 1
+dnl Copyright (C) 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.
+
+AC_DEFUN([gl_MINMAX],
+[
+ AC_REQUIRE([gl_PREREQ_MINMAX])
+])
+
+# Prerequisites of lib/minmax.h.
+AC_DEFUN([gl_PREREQ_MINMAX],
+[
+ gl_MINMAX_IN_HEADER([limits.h])
+ gl_MINMAX_IN_HEADER([sys/param.h])
+])
+
+dnl gl_MINMAX_IN_HEADER(HEADER)
+AC_DEFUN([gl_MINMAX_IN_HEADER],
+[
+ define([header],[translit([$1],[./-],
+ [___])])
+ define([HEADER],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+ AC_CACHE_CHECK([whether <$1> defines MIN and MAX],
+ [gl_cv_minmax_in_]header,
+ [AC_TRY_COMPILE([#include <$1>
+int x = MIN (42, 17);], [],
+ [gl_cv_minmax_in_]header[=yes],
+ [gl_cv_minmax_in_]header[=no])])
+ if test $gl_cv_minmax_in_[]header = yes; then
+ AC_DEFINE([HAVE_MINMAX_IN_]HEADER, 1,
+ [Define to 1 if <$1> defines the MIN and MAX macros.])
+ fi
+ undefine([HEADER])
+ undefine([header])
+])
diff --git a/gl/minmax.h b/gl/minmax.h
index 0e505109e7..975ea76d13 100644
--- a/gl/minmax.h
+++ b/gl/minmax.h
@@ -1,5 +1,5 @@
/* MIN, MAX macros.
- Copyright (C) 1995, 1998, 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1998, 2001, 2003, 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
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _MINMAX_H
#define _MINMAX_H
@@ -24,8 +24,15 @@
#include this file as the last one among the #include list. */
/* Before we define the following symbols we get the <limits.h> file
- since otherwise we get redefinitions on some systems. */
-#include <limits.h>
+ since otherwise we get redefinitions on some systems if <limits.h> is
+ included after this file. Likewise for <sys/param.h>.
+ If more than one of these system headers define MIN and MAX, pick just
+ one of the headers (because the definitions most likely are the same). */
+#if HAVE_MINMAX_IN_LIMITS_H
+# include <limits.h>
+#elif HAVE_MINMAX_IN_SYS_PARAM_H
+# include <sys/param.h>
+#endif
/* Note: MIN and MAX should be used with two arguments of the
same type. They might not return the minimum and maximum of their two
diff --git a/gl/printf-args.c b/gl/printf-args.c
index 926ae8ffe7..0ed1acbb8d 100644
--- a/gl/printf-args.c
+++ b/gl/printf-args.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/gl/printf-args.h b/gl/printf-args.h
index 4b75c723f3..cec1cc6c2a 100644
--- a/gl/printf-args.h
+++ b/gl/printf-args.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _PRINTF_ARGS_H
#define _PRINTF_ARGS_H
diff --git a/gl/printf-parse.c b/gl/printf-parse.c
index b386b7b9b8..3d2fb175f2 100644
--- a/gl/printf-parse.c
+++ b/gl/printf-parse.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/gl/printf-parse.h b/gl/printf-parse.h
index f3f4586606..82a0d37cd7 100644
--- a/gl/printf-parse.h
+++ b/gl/printf-parse.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _PRINTF_PARSE_H
#define _PRINTF_PARSE_H
diff --git a/gl/progname.c b/gl/progname.c
index 9917efa9ce..ea32128ab4 100644
--- a/gl/progname.c
+++ b/gl/progname.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
diff --git a/gl/progname.h b/gl/progname.h
index 5292cd1bfd..a5d9a04c83 100644
--- a/gl/progname.h
+++ b/gl/progname.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _PROGNAME_H
#define _PROGNAME_H
diff --git a/gl/snprintf.c b/gl/snprintf.c
index 9a4edc1f5f..5870f8dde3 100644
--- a/gl/snprintf.c
+++ b/gl/snprintf.c
@@ -14,7 +14,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
diff --git a/gl/snprintf.h b/gl/snprintf.h
index a72f74d639..5032b9e8f8 100644
--- a/gl/snprintf.h
+++ b/gl/snprintf.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef SNPRINTF_H
#define SNPRINTF_H
diff --git a/gl/stdbool_.h b/gl/stdbool_.h
index e33715a615..3177ae03cf 100644
--- a/gl/stdbool_.h
+++ b/gl/stdbool_.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _STDBOOL_H
#define _STDBOOL_H
diff --git a/gl/vasnprintf.c b/gl/vasnprintf.c
index c2baeb691b..324d62ecda 100644
--- a/gl/vasnprintf.c
+++ b/gl/vasnprintf.c
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
This must come before <config.h> because <config.h> may include
diff --git a/gl/vasnprintf.h b/gl/vasnprintf.h
index 2712106990..894008caec 100644
--- a/gl/vasnprintf.h
+++ b/gl/vasnprintf.h
@@ -13,7 +13,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _VASNPRINTF_H
#define _VASNPRINTF_H
diff --git a/gl/xsize.h b/gl/xsize.h
index 7634c6d4d5..341fb16ca7 100644
--- a/gl/xsize.h
+++ b/gl/xsize.h
@@ -14,7 +14,7 @@
You should have received a copy of the GNU 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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _XSIZE_H
#define _XSIZE_H