From f176d5adcfd3fb63c8b7a3e7a6ba08b40494b3a0 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 22 Aug 2006 21:16:36 +0000 Subject: [PATCH] * stdint_h.m4 (gl_AC_HEADER_STDINT_H): Avoid compiler warning. * inttypes_h.m4 (gl_AC_HEADER_INTTYPES_H): Likewise. * longlong.m4 (AC_TYPE_LONG_LONG_INT): Likewise. * intmax_t.m4 (gt_AC_TYPE_INTMAX_T): Likewise. --- m4/ChangeLog | 7 +++++++ m4/intmax_t.m4 | 6 +++--- m4/inttypes_h.m4 | 6 +++--- m4/longlong.m4 | 6 +++--- m4/stdint_h.m4 | 6 +++--- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index 3718d7f29..a3e2cc25e 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,10 @@ +2006-08-22 Eric Blake + + * stdint_h.m4 (gl_AC_HEADER_STDINT_H): Avoid compiler warning. + * inttypes_h.m4 (gl_AC_HEADER_INTTYPES_H): Likewise. + * longlong.m4 (AC_TYPE_LONG_LONG_INT): Likewise. + * intmax_t.m4 (gt_AC_TYPE_INTMAX_T): Likewise. + 2006-08-22 Bruno Haible * readutmp.m4 (gl_READUTMP): Compile readutmp.c only if or diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index 44b16523c..17c7b0ae8 100644 --- a/m4/intmax_t.m4 +++ b/m4/intmax_t.m4 @@ -1,5 +1,5 @@ -# intmax_t.m4 serial 4 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. +# intmax_t.m4 serial 5 +dnl Copyright (C) 1997-2004, 2006 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. @@ -46,7 +46,7 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T], #if HAVE_INTTYPES_H_WITH_UINTMAX #include #endif -], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) +], [intmax_t x = -1; return !x;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) if test $gt_cv_c_intmax_t = yes; then AC_DEFINE(HAVE_INTMAX_T, 1, [Define if you have the 'intmax_t' type in or .]) diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index a5d075d96..edc8ecb2d 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ -# inttypes_h.m4 serial 6 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. +# inttypes_h.m4 serial 7 +dnl Copyright (C) 1997-2004, 2006 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. @@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H], [AC_TRY_COMPILE( [#include #include ], - [uintmax_t i = (uintmax_t) -1;], + [uintmax_t i = (uintmax_t) -1; return !i;], gl_cv_header_inttypes_h=yes, gl_cv_header_inttypes_h=no)]) if test $gl_cv_header_inttypes_h = yes; then diff --git a/m4/longlong.m4 b/m4/longlong.m4 index ea7c485c3..89a47bd19 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,4 +1,4 @@ -# longlong.m4 serial 6 +# longlong.m4 serial 7 dnl Copyright (C) 1999-2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -22,8 +22,8 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT], ? 1 : -1)]; int i = 63;]], [[long long int llmax = 9223372036854775807ll; - return (ll << 63 | ll >> 63 | ll < i | ll > i - | llmax / ll | llmax % ll);]])], + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll));]])], [ac_cv_type_long_long_int=yes], [ac_cv_type_long_long_int=no])]) if test $ac_cv_type_long_long_int = yes; then diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 3355f35aa..db9a8ac4c 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ -# stdint_h.m4 serial 5 -dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. +# stdint_h.m4 serial 6 +dnl Copyright (C) 1997-2004, 2006 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. @@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_STDINT_H], [AC_TRY_COMPILE( [#include #include ], - [uintmax_t i = (uintmax_t) -1;], + [uintmax_t i = (uintmax_t) -1; return !i;], gl_cv_header_stdint_h=yes, gl_cv_header_stdint_h=no)]) if test $gl_cv_header_stdint_h = yes; then -- 2.11.0