* 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.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 3718d7f2946da1f3b4edf58536dcfe9033723b4b..a3e2cc25e530fba601217f357500add5fcffb190 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-22  Eric Blake  <ebb9@byu.net>
+
+       * 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  <bruno@clisp.org>
 
        * readutmp.m4 (gl_READUTMP): Compile readutmp.c only if <utmp.h> or

diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4
index 44b16523cc9add450d8f63c01b35e2e4bdf6eefd..17c7b0ae88a62f31cee7862d6fa97ea623f8279d 100644 (file)
--- 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 <inttypes.h>
 #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 <stdint.h> or <inttypes.h>.])

diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index a5d075d96875a5e9f432467c3b84054efbf59379..edc8ecb2db55a21967c717bcf8fec96c5c44e7cb 100644 (file)
--- 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 <sys/types.h>
 #include <inttypes.h>],
-    [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 ea7c485c368e84847d4e1b076c9ea16e3f8b60e3..89a47bd1959a7d08965010c425f4991f191d30c6 100644 (file)
--- 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 3355f35aa3ffef364fc812923db663ff1564292a..db9a8ac4c2372145b37af9fc52d395f8eba17ef7 100644 (file)
--- 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 <sys/types.h>
 #include <stdint.h>],
-    [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