projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove old, dead code in last commit.
[gnulib.git]
/
m4
/
size_max.m4
diff --git
a/m4/size_max.m4
b/m4/size_max.m4
index
bfba811
..
e0e7b3f
100644
(file)
--- a/
m4/size_max.m4
+++ b/
m4/size_max.m4
@@
-1,5
+1,5
@@
-# size_max.m4 serial
5
-dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
+# size_max.m4 serial
7
+dnl Copyright (C) 2003, 2005-2006
, 2008
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.
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.
@@
-8,7
+8,7
@@
dnl From Bruno Haible.
AC_DEFUN([gl_SIZE_MAX],
[
AC_DEFUN([gl_SIZE_MAX],
[
- AC_CHECK_HEADERS(
stdint.h
)
+ AC_CHECK_HEADERS(
[stdint.h]
)
dnl First test whether the system already has SIZE_MAX.
AC_MSG_CHECKING([for SIZE_MAX])
AC_CACHE_VAL([gl_cv_size_max], [
dnl First test whether the system already has SIZE_MAX.
AC_MSG_CHECKING([for SIZE_MAX])
AC_CACHE_VAL([gl_cv_size_max], [
@@
-21,16
+21,16
@@
AC_DEFUN([gl_SIZE_MAX],
#ifdef SIZE_MAX
Found it
#endif
#ifdef SIZE_MAX
Found it
#endif
-],
gl_cv_size_max=yes
)
+],
[gl_cv_size_max=yes]
)
if test -z "$gl_cv_size_max"; then
dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
dnl than the type 'unsigned long'. Try hard to find a definition that can
dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
if test -z "$gl_cv_size_max"; then
dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
dnl than the type 'unsigned long'. Try hard to find a definition that can
dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
-
_AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1
,
+
AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1]
,
[#include <stddef.h>
[#include <stddef.h>
-#include <limits.h>],
size_t_bits_minus_1=
)
-
_AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint
,
- [#include <stddef.h>],
fits_in_uint=
)
+#include <limits.h>],
[size_t_bits_minus_1=]
)
+
AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)]
,
+ [#include <stddef.h>],
[fits_in_uint=]
)
if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
if test $fits_in_uint = 1; then
dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
if test $fits_in_uint = 1; then
dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
@@
-38,7
+38,7
@@
Found it
AC_TRY_COMPILE([#include <stddef.h>
extern size_t foo;
extern unsigned long foo;
AC_TRY_COMPILE([#include <stddef.h>
extern size_t foo;
extern unsigned long foo;
- ], [],
fits_in_uint=0
)
+ ], [],
[fits_in_uint=0]
)
fi
dnl We cannot use 'expr' to simplify this expression, because 'expr'
dnl works only with 'long' integers in the host environment, while we
fi
dnl We cannot use 'expr' to simplify this expression, because 'expr'
dnl works only with 'long' integers in the host environment, while we
@@
-60,3
+60,9
@@
Found it
[Define as the maximum value of type 'size_t', if the system doesn't define it.])
fi
])
[Define as the maximum value of type 'size_t', if the system doesn't define it.])
fi
])
+
+dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
+dnl Remove this when we can assume autoconf >= 2.61.
+m4_ifdef([AC_COMPUTE_INT], [], [
+ AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
+])