diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-01-08 11:53:52 +0100 |
| commit | fa838e76139763f902c7d27cb9e1d393ed6a15e4 (patch) | |
| tree | 7d0ae09775ea950056193eaa2ca93844299d46f1 /gnulib-m4/strncat.m4 | |
| parent | c78359d9542c86b972aac373efcf7bc7a8a560e5 (diff) | |
| parent | 2959e59fab3bab834368adefd90bd4b1b094366b (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'gnulib-m4/strncat.m4')
| -rw-r--r-- | gnulib-m4/strncat.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnulib-m4/strncat.m4 b/gnulib-m4/strncat.m4 index b4fcbe2..627280c 100644 --- a/gnulib-m4/strncat.m4 +++ b/gnulib-m4/strncat.m4 @@ -1,12 +1,12 @@ -# strncat.m4 serial 4 -dnl Copyright (C) 2002-2004, 2009-2018 Free Software Foundation, Inc. +# strncat.m4 serial 6 +dnl Copyright (C) 2002-2004, 2009-2022 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. AC_DEFUN_ONCE([gl_FUNC_STRNCAT], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles @@ -31,7 +31,8 @@ AC_DEFUN_ONCE([gl_FUNC_STRNCAT], # define MAP_FILE 0 # endif #endif -]], [[ +]GL_MDA_DEFINES], +[[ char *fence = NULL; #if HAVE_SYS_MMAN_H && HAVE_MPROTECT # if HAVE_MAP_ANONYMOUS |