diff options
author | Simon Josefsson <simon@josefsson.org> | 2004-08-17 08:45:00 +0000 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2004-08-17 08:45:00 +0000 |
commit | 3756e804dacc637e8a00ff57ab2b80945abdb8c3 (patch) | |
tree | 374f912ca49fd061c2dc6cb12185faf0ab2dc20a /gl | |
parent | 7bd95fcd5ec8933d248f246eff5a8c0a92ac70d5 (diff) | |
download | gnutls-3756e804dacc637e8a00ff57ab2b80945abdb8c3.tar.gz |
Use minmax.h from gnulib instead of GMIN/GMAX.
Diffstat (limited to 'gl')
-rw-r--r-- | gl/Makefile.am | 4 | ||||
-rw-r--r-- | gl/m4/gnulib.m4 | 2 | ||||
-rw-r--r-- | gl/minmax.h | 53 |
3 files changed, 57 insertions, 2 deletions
diff --git a/gl/Makefile.am b/gl/Makefile.am index b20d924c29..f59ed59af8 100644 --- a/gl/Makefile.am +++ b/gl/Makefile.am @@ -10,7 +10,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 error exit extensions getline getpass-gnu gettext progname stdbool unlocked-io +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --libtool error exit extensions getline getpass-gnu gettext minmax progname stdbool unlocked-io AUTOMAKE_OPTIONS = 1.8 gnits @@ -36,6 +36,8 @@ libgnu_la_SOURCES += getpass.h libgnu_la_SOURCES += gettext.h +libgnu_la_SOURCES += minmax.h + libgnu_la_SOURCES += progname.h progname.c BUILT_SOURCES += $(STDBOOL_H) diff --git a/gl/m4/gnulib.m4 b/gl/m4/gnulib.m4 index 9992333439..fe1625e28a 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 error exit extensions getline getpass-gnu gettext progname stdbool unlocked-io +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --libtool error exit extensions getline getpass-gnu gettext minmax progname stdbool unlocked-io AC_DEFUN([gl_EARLY], [ diff --git a/gl/minmax.h b/gl/minmax.h new file mode 100644 index 0000000000..0e505109e7 --- /dev/null +++ b/gl/minmax.h @@ -0,0 +1,53 @@ +/* MIN, MAX macros. + Copyright (C) 1995, 1998, 2001, 2003 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 + the Free Software Foundation; either version 2, 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. + + 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. */ + +#ifndef _MINMAX_H +#define _MINMAX_H + +/* Note: MIN, MAX are also defined in <sys/param.h> on some systems + (glibc, IRIX, HP-UX, OSF/1). Therefore you might get warnings about + MIN, MAX macro redefinitions on some systems; the workaround is to + #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> + +/* 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 + arguments, if the arguments have different types or have unusual + floating-point values. For example, on a typical host with 32-bit 'int', + 64-bit 'long long', and 64-bit IEEE 754 'double' types: + + MAX (-1, 2147483648) returns 4294967295. + MAX (9007199254740992.0, 9007199254740993) returns 9007199254740992.0. + MAX (NaN, 0.0) returns 0.0. + MAX (+0.0, -0.0) returns -0.0. + + and in each case the answer is in some sense bogus. */ + +/* MAX(a,b) returns the maximum of A and B. */ +#ifndef MAX +# define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif + +/* MIN(a,b) returns the minimum of A and B. */ +#ifndef MIN +# define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif + +#endif /* _MINMAX_H */ |