summaryrefslogtreecommitdiff
path: root/gnulib-m4/strncat.m4
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-02 12:05:34 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-02 12:05:34 +0100
commit7c78c92a28ef43d68b172adf97fbd8a27be3baec (patch)
tree3a98b0d01865f5e00912521c58386eb008a70d07 /gnulib-m4/strncat.m4
parent4d76768442551c97a85e6f133cb818d223012746 (diff)
parent3ee36dc9787cee6ab5314af8f9c01b05a50e7d9d (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'gnulib-m4/strncat.m4')
-rw-r--r--gnulib-m4/strncat.m412
1 files changed, 7 insertions, 5 deletions
diff --git a/gnulib-m4/strncat.m4 b/gnulib-m4/strncat.m4
index cda109c..92ee572 100644
--- a/gnulib-m4/strncat.m4
+++ b/gnulib-m4/strncat.m4
@@ -1,5 +1,5 @@
-# strncat.m4 serial 2
-dnl Copyright (C) 2002-2004, 2009-2016 Free Software Foundation, Inc.
+# strncat.m4 serial 4
+dnl Copyright (C) 2002-2004, 2009-2017 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_ONCE([gl_FUNC_STRNCAT],
AC_CHECK_HEADERS_ONCE([sys/mman.h])
AC_CHECK_FUNCS_ONCE([mprotect])
- dnl Detect bug in Solaris 8..10 on SPARC:
+ dnl Detect bug in Solaris 8..10 on SPARC and Solaris 11.0 on x86:
dnl strncat should not dereference more than n bytes, but always dereferences
dnl n+1 bytes if the first n bytes don't contain a NUL byte.
dnl Assume that strncat works on platforms that lack mprotect.
@@ -84,9 +84,11 @@ AC_DEFUN_ONCE([gl_FUNC_STRNCAT],
[
case "$host_os" in
# Guess no on Solaris.
- solaris*) gl_cv_func_strncat_works="guessing no";;
+ solaris*) gl_cv_func_strncat_works="guessing no" ;;
+ # Guess yes on native Windows.
+ mingw*) gl_cv_func_strncat_works="guessing yes" ;;
# Guess yes otherwise.
- *) gl_cv_func_strncat_works="guessing yes";;
+ *) gl_cv_func_strncat_works="guessing yes" ;;
esac
])
])