diff options
Diffstat (limited to 'gl/m4/uintmax_t.m4')
-rw-r--r-- | gl/m4/uintmax_t.m4 | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/gl/m4/intmax_t.m4 b/gl/m4/intmax_t.m4 index 6ea7053..ef32e1b 100644 --- a/gl/m4/intmax_t.m4 +++ b/gl/m4/intmax_t.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # intmax_t.m4 serial 8 | 1 | # intmax_t.m4 serial 9 |
2 | dnl Copyright (C) 1997-2004, 2006-2007, 2009-2013 Free Software Foundation, | 2 | dnl Copyright (C) 1997-2004, 2006-2007, 2009-2023 Free Software Foundation, |
3 | dnl Inc. | 3 | dnl Inc. |
4 | dnl This file is free software; the Free Software Foundation | 4 | dnl This file is free software; the Free Software Foundation |
5 | dnl gives unlimited permission to copy and/or distribute it, | 5 | dnl gives unlimited permission to copy and/or distribute it, |
@@ -19,11 +19,7 @@ AC_DEFUN([gl_AC_TYPE_INTMAX_T], | |||
19 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | 19 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) |
20 | AC_REQUIRE([gl_AC_HEADER_STDINT_H]) | 20 | AC_REQUIRE([gl_AC_HEADER_STDINT_H]) |
21 | if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then | 21 | if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then |
22 | AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) | 22 | AC_DEFINE_UNQUOTED([intmax_t], [long long], |
23 | test $ac_cv_type_long_long_int = yes \ | ||
24 | && ac_type='long long' \ | ||
25 | || ac_type='long' | ||
26 | AC_DEFINE_UNQUOTED([intmax_t], [$ac_type], | ||
27 | [Define to long or long long if <inttypes.h> and <stdint.h> don't define.]) | 23 | [Define to long or long long if <inttypes.h> and <stdint.h> don't define.]) |
28 | else | 24 | else |
29 | AC_DEFINE([HAVE_INTMAX_T], [1], | 25 | AC_DEFINE([HAVE_INTMAX_T], [1], |
@@ -57,11 +53,7 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T], | |||
57 | AC_DEFINE([HAVE_INTMAX_T], [1], | 53 | AC_DEFINE([HAVE_INTMAX_T], [1], |
58 | [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) | 54 | [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) |
59 | else | 55 | else |
60 | AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) | 56 | AC_DEFINE_UNQUOTED([intmax_t], [long long], |
61 | test $ac_cv_type_long_long_int = yes \ | ||
62 | && ac_type='long long' \ | ||
63 | || ac_type='long' | ||
64 | AC_DEFINE_UNQUOTED([intmax_t], [$ac_type], | ||
65 | [Define to long or long long if <stdint.h> and <inttypes.h> don't define.]) | 57 | [Define to long or long long if <stdint.h> and <inttypes.h> don't define.]) |
66 | fi | 58 | fi |
67 | ]) | 59 | ]) |
diff --git a/gl/m4/uintmax_t.m4 b/gl/m4/uintmax_t.m4 deleted file mode 100644 index c6ff800..0000000 --- a/gl/m4/uintmax_t.m4 +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | # uintmax_t.m4 serial 12 | ||
2 | dnl Copyright (C) 1997-2004, 2007-2013 Free Software Foundation, Inc. | ||
3 | dnl This file is free software; the Free Software Foundation | ||
4 | dnl gives unlimited permission to copy and/or distribute it, | ||
5 | dnl with or without modifications, as long as this notice is preserved. | ||
6 | |||
7 | dnl From Paul Eggert. | ||
8 | |||
9 | AC_PREREQ([2.13]) | ||
10 | |||
11 | # Define uintmax_t to 'unsigned long' or 'unsigned long long' | ||
12 | # if it is not already defined in <stdint.h> or <inttypes.h>. | ||
13 | |||
14 | AC_DEFUN([gl_AC_TYPE_UINTMAX_T], | ||
15 | [ | ||
16 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | ||
17 | AC_REQUIRE([gl_AC_HEADER_STDINT_H]) | ||
18 | if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then | ||
19 | AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) | ||
20 | test $ac_cv_type_unsigned_long_long_int = yes \ | ||
21 | && ac_type='unsigned long long' \ | ||
22 | || ac_type='unsigned long' | ||
23 | AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type], | ||
24 | [Define to unsigned long or unsigned long long | ||
25 | if <stdint.h> and <inttypes.h> don't define.]) | ||
26 | else | ||
27 | AC_DEFINE([HAVE_UINTMAX_T], [1], | ||
28 | [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) | ||
29 | fi | ||
30 | ]) | ||