diff options
| author | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2017-05-26 19:29:20 -0300 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> | 2017-06-01 20:44:22 -0300 |
| commit | 09103e40252454e906a0b8543a142fc96b4c17c1 (patch) | |
| tree | 81053ef42965eb802105c51c7cdf9ed860e0511c | |
| parent | 6da85a0daf65a407f942622e23fc20b37b80168c (diff) | |
| download | glibc-09103e40252454e906a0b8543a142fc96b4c17c1.tar.gz glibc-09103e40252454e906a0b8543a142fc96b4c17c1.tar.xz glibc-09103e40252454e906a0b8543a142fc96b4c17c1.zip | |
Include sys/param.h in stdlib/gmp-impl.h instead of redefining MAX/MIN
In stdlib/gmp-impl.h, the macros MAX and MIN are defined exactly the same as in sys/param.h. This patch removes the redefinition and makes gmp-impl.h include sys/param.h instead. Tested for powerpc64le and s390x. * stdlib/gmp-impl.h: Include sys/param.h instead of redefining the macros MAX and MIN.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | stdlib/gmp-impl.h | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 961c549653..69c13509c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-06-01 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com> + + * stdlib/gmp-impl.h: Include sys/param.h instead of redefining the + macros MAX and MIN. + 2017-06-01 Joseph Myers <joseph@codesourcery.com> * conform/data/signal.h-data (sa_sigaction): Do not expect for diff --git a/stdlib/gmp-impl.h b/stdlib/gmp-impl.h index a6594ffe4b..89693c4f0b 100644 --- a/stdlib/gmp-impl.h +++ b/stdlib/gmp-impl.h @@ -64,12 +64,8 @@ along with the GNU MP Library; see the file COPYING.LIB. If not, see #define inline /* Empty */ #endif -#ifndef MIN -#define MIN(l,o) ((l) < (o) ? (l) : (o)) -#endif -#ifndef MAX -#define MAX(h,i) ((h) > (i) ? (h) : (i)) -#endif +/* Get MAX/MIN macros. */ +#include <sys/param.h> /* Field access macros. */ #define SIZ(x) ((x)->_mp_size) |