From 4ddb141e3fc7bf94ac7ac82b87aa777d45404b40 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 23 May 2005 10:26:24 +0000 Subject: [PATCH] Add autoconf tests for the 'minmax' module. --- ChangeLog | 5 +++++ lib/ChangeLog | 6 ++++++ lib/minmax.h | 13 ++++++++++--- m4/ChangeLog | 7 ++++++- modules/minmax | 2 ++ 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ac35e0ee1..40eb5a4aa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-05-18 Derek Price + + * modules/minmax (Files): Add m4/minmax.m4. + (configure.ac): Add gl_MINMAX. + 2005-05-20 Paul Eggert * MODULES.html.sh (File system functions): Add fts, fts-lgpl. diff --git a/lib/ChangeLog b/lib/ChangeLog index eda3c44741..f938e2d304 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2005-05-22 Bruno Haible + + * minmax.h: Include only when it defines MIN, MAX. + Also include if it defines MIN, MAX. + Based on a patch by Derek Price . + 2005-05-22 Bruno Haible * stdint_.h (_STDINT_H_HAVE_INT64): New macro. Use it in #ifdefs. diff --git a/lib/minmax.h b/lib/minmax.h index 63b55b4ee8..975ea76d13 100644 --- a/lib/minmax.h +++ b/lib/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 @@ -24,8 +24,15 @@ #include this file as the last one among the #include list. */ /* Before we define the following symbols we get the file - since otherwise we get redefinitions on some systems. */ -#include + since otherwise we get redefinitions on some systems if is + included after this file. Likewise for . + 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 +#elif HAVE_MINMAX_IN_SYS_PARAM_H +# include +#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/m4/ChangeLog b/m4/ChangeLog index de96461ecd..930047e7f8 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2005-05-22 Bruno Haible + + * minmax.m4: New file. + Based on a patch by Derek Price . + 2005-05-20 Paul Eggert * fts.m4 (gl_FUNC_FTS_CORE): Renamed from gl_FUNC_FTS. @@ -4224,4 +4229,4 @@ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, -are permitted provided the copyright notice and this notice are preserved. +are permitted provided the copyright notice and this notice are preserved. \ No newline at end of file diff --git a/modules/minmax b/modules/minmax index 3cf650256f..5b122b76c6 100644 --- a/modules/minmax +++ b/modules/minmax @@ -3,10 +3,12 @@ MIN, MAX macros. Files: lib/minmax.h +m4/minmax.m4 Depends-on: configure.ac: +gl_MINMAX Makefile.am: lib_SOURCES += minmax.h -- 2.30.2