diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2025-03-22 18:00:25 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2025-03-22 18:00:25 +0100 |
| commit | 0737819efdd0bae112d16d874cac7e747e43cd08 (patch) | |
| tree | 98a9ac84f7f347ae530c14852c68870682f3d04c /gnulib-m4/calloc.m4 | |
| parent | 163a663518f33bab48b28431972e580b366b4d49 (diff) | |
| parent | e670957a8693f860cf7d77fed4ce6b4b056a8083 (diff) | |
Merge branch 'release/debian/1.3-1'debian/1.3-1
Diffstat (limited to 'gnulib-m4/calloc.m4')
| -rw-r--r-- | gnulib-m4/calloc.m4 | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gnulib-m4/calloc.m4 b/gnulib-m4/calloc.m4 index 49303d96..c69ce414 100644 --- a/gnulib-m4/calloc.m4 +++ b/gnulib-m4/calloc.m4 @@ -1,9 +1,9 @@ -# calloc.m4 serial 31 - -# Copyright (C) 2004-2024 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# calloc.m4 +# serial 34 +dnl Copyright (C) 2004-2024 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. # Written by Jim Meyering. @@ -58,6 +58,11 @@ AC_DEFUN([gl_FUNC_CALLOC_GNU], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_CALLOC_POSIX]) + + dnl Through the dependency on module extensions-aix, _LINUX_SOURCE_COMPAT + dnl gets defined already before this macro gets invoked. This helps + dnl if !(__VEC__ || __AIXVEC), and doesn't hurt otherwise. + REPLACE_CALLOC_FOR_CALLOC_GNU="$REPLACE_CALLOC_FOR_CALLOC_POSIX" if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 0; then _AC_FUNC_CALLOC_IF([], [REPLACE_CALLOC_FOR_CALLOC_GNU=1]) |