Merge branch 'master' into refactor/check_ide_smart

1 files changed, 4 insertions, 3 deletions

diff --git a/gl/m4/memchr.m4 b/gl/m4/memchr.m4
index 346a2882..1c2ecf1d 100644
--- a/gl/m4/memchr.m4
+++ b/gl/m4/memchr.m4
@@ -1,9 +1,10 @@
 # memchr.m4
-# serial 19
-dnl Copyright (C) 2002-2004, 2009-2024 Free Software Foundation, Inc.
+# serial 20
+dnl Copyright (C) 2002-2004, 2009-2025 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 offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
 [
@@ -49,7 +50,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
   if (fd >= 0)
 # endif
     {
-      int pagesize = getpagesize ();
+      long int pagesize = sysconf (_SC_PAGESIZE);
       char *two_pages =
         (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE,
                        flags, fd, 0);