From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Sep 2025 10:49:14 +0000 (+0200)
Subject: vma-iter: Remove support for OSF/1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97b0beb2e55419d419e7b09427aa62b10049315b;p=thirdparty%2Fgnulib.git

vma-iter: Remove support for OSF/1.

* lib/vma-iter.h (VMA_ITERATE_SUPPORTED): Don't define on OSF/1.
* lib/vma-iter.c: Remove code for OSF/1.
---

diff --git a/ChangeLog b/ChangeLog
index 04dc9a07d5..2ddd75dc0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+	vma-iter: Remove support for OSF/1.
+	* lib/vma-iter.h (VMA_ITERATE_SUPPORTED): Don't define on OSF/1.
+	* lib/vma-iter.c: Remove code for OSF/1.
+
 	unistd-h: Remove support for OSF/1.
 	* lib/unistd.in.h: Remove code for OSF/1.
 
diff --git a/lib/vma-iter.c b/lib/vma-iter.c
index f01a8902d2..295696039c 100644
--- a/lib/vma-iter.c
+++ b/lib/vma-iter.c
@@ -82,7 +82,7 @@
 # include <sys/procfs.h> /* prmap_t */
 #endif
 
-#if defined __sgi || defined __osf__ /* IRIX, OSF/1 */
+#if defined __sgi /* IRIX */
 # include <string.h> /* memcpy */
 # include <sys/types.h>
 # include <sys/mman.h> /* mmap, munmap */
@@ -1191,7 +1191,7 @@ vma_iterate (vma_iterate_callback_fn callback, void *data)
   close (fd);
   return 0;
 
-#elif defined __sgi || defined __osf__ /* IRIX, OSF/1 */
+#elif defined __sgi /* IRIX */
 
   size_t pagesize;
   char fnamebuf[6+10+1];
diff --git a/lib/vma-iter.h b/lib/vma-iter.h
index 8d2d1db313..bd5f35f582 100644
--- a/lib/vma-iter.h
+++ b/lib/vma-iter.h
@@ -57,7 +57,7 @@ extern int vma_iterate (vma_iterate_callback_fn callback, void *data);
    this platform.
    Note that even when this macro is defined, vma_iterate() may still fail to
    find any virtual memory area, for example if /proc is not mounted.  */
-#if defined __linux__ || defined __ANDROID__ || defined __gnu_hurd__ || defined __FreeBSD_kernel__ || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined _AIX || defined __sgi || defined __osf__ || defined __sun || HAVE_PSTAT_GETPROCVM || (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __CYGWIN__ || defined __BEOS__ || defined __HAIKU__ || defined __minix || HAVE_MQUERY
+#if defined __linux__ || defined __ANDROID__ || defined __gnu_hurd__ || defined __FreeBSD_kernel__ || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined _AIX || defined __sgi || defined __sun || HAVE_PSTAT_GETPROCVM || (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __CYGWIN__ || defined __BEOS__ || defined __HAIKU__ || defined __minix || HAVE_MQUERY
 # define VMA_ITERATE_SUPPORTED 1
 #endif