errno-iter, strerrorname_np: Remove support for OSF/1.

* lib/errno-iter.c (errno_iterate): Remove cases for EAIO, ECLONEME,
EDIRTY, EDUPPKG, EEMULATE, EFAIL, EINPROG, EMTIMERS, ERELOCATED,
ESUCCESS, EVERSION.
* lib/strerrorname_np.c (strerrorname_np): Likewise.
* tests/test-strerrorname_np.c (main): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 929cf090390a60b03d0dd1b177292ac1dc026cb4..3d98aa314799efaa173b0cb4c6e9d482e7938efa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+       errno-iter, strerrorname_np: Remove support for OSF/1.
+       * lib/errno-iter.c (errno_iterate): Remove cases for EAIO, ECLONEME,
+       EDIRTY, EDUPPKG, EEMULATE, EFAIL, EINPROG, EMTIMERS, ERELOCATED,
+       ESUCCESS, EVERSION.
+       * lib/strerrorname_np.c (strerrorname_np): Likewise.
+       * tests/test-strerrorname_np.c (main): Likewise.
+
        errno-h: Remove support for OSF/1.
        * lib/errno.in.h: Don't test EMULTIHOP_HIDDEN, ENOLINK_HIDDEN,
        EOVERFLOW_HIDDEN.

diff --git a/lib/errno-iter.c b/lib/errno-iter.c
index 618a7871a5c123b081a46500bb7a1a6c03a185aa..8c18fcaa30a39b85aba706528775e445c02a3e6a 100644 (file)
--- a/lib/errno-iter.c
+++ b/lib/errno-iter.c
@@ -282,10 +282,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EADV
   if (callback (data, EADV)) return;
   #endif
-  /* OSF/1 */
-  #if defined EAIO
-  if (callback (data, EAIO)) return;
-  #endif
   /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EAUTH
   if (callback (data, EAUTH)) return;
@@ -346,7 +342,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EBADREQUEST
   if (callback (data, EBADREQUEST)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EBADRPC
   if (callback (data, EBADRPC)) return;
   #endif
@@ -418,10 +414,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ECLOCKCPU
   if (callback (data, ECLOCKCPU)) return;
   #endif
-  /* OSF/1 */
-  #if defined ECLONEME && ECLONEME != ERESTART
-  if (callback (data, ECLONEME)) return;
-  #endif
   /* Linux, HP-UX, IRIX, Solaris, Cygwin */
   #if defined ECOMM
   if (callback (data, ECOMM)) return;
@@ -478,10 +470,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EDIRIOCTL
   if (callback (data, EDIRIOCTL)) return;
   #endif
-  /* OSF/1 */
-  #if defined EDIRTY
-  if (callback (data, EDIRTY)) return;
-  #endif
   /* IRIX */
   #if defined EDISJOINT
   if (callback (data, EDISJOINT)) return;
@@ -502,10 +490,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EDOTDOT
   if (callback (data, EDOTDOT)) return;
   #endif
-  /* OSF/1 */
-  #if defined EDUPPKG
-  if (callback (data, EDUPPKG)) return;
-  #endif
   /* GNU/Hurd */
   #if defined ED_ALREADY_OPEN
   if (callback (data, ED_ALREADY_OPEN)) return;
@@ -550,10 +534,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EEMPTY
   if (callback (data, EEMPTY)) return;
   #endif
-  /* OSF/1 */
-  #if defined EEMULATE
-  if (callback (data, EEMULATE)) return;
-  #endif
   /* IRIX */
   #if defined EENDOFMINOR
   if (callback (data, EENDOFMINOR)) return;
@@ -562,10 +542,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EENQUEUED
   if (callback (data, EENQUEUED)) return;
   #endif
-  /* OSF/1 */
-  #if defined EFAIL
-  if (callback (data, EFAIL)) return;
-  #endif
   /* AIX */
   #if defined EFORMAT
   if (callback (data, EFORMAT)) return;
@@ -582,7 +558,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EFSCORRUPTED
   if (callback (data, EFSCORRUPTED)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, Cygwin */
   #if defined EFTYPE
   if (callback (data, EFTYPE)) return;
   #endif
@@ -602,7 +578,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EGROUPLOOP
   if (callback (data, EGROUPLOOP)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
   #if defined EHOSTDOWN
   if (callback (data, EHOSTDOWN)) return;
   #endif
@@ -618,10 +594,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EINIT
   if (callback (data, EINIT)) return;
   #endif
-  /* OSF/1 */
-  #if defined EINPROG
-  if (callback (data, EINPROG)) return;
-  #endif
   /* IRIX */
   #if defined EINVALMODE
   if (callback (data, EINVALMODE)) return;
@@ -650,7 +622,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EJOINED
   if (callback (data, EJOINED)) return;
   #endif
-  /* FreeBSD, OSF/1 */
+  /* FreeBSD */
   #if defined EJUSTRETURN
   if (callback (data, EJUSTRETURN)) return;
   #endif
@@ -942,7 +914,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EMACH_SEND_WILL_NOTIFY
   if (callback (data, EMACH_SEND_WILL_NOTIFY)) return;
   #endif
-  /* AIX, OSF/1 */
+  /* AIX */
   #if defined EMEDIA
   if (callback (data, EMEDIA)) return;
   #endif
@@ -1002,10 +974,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EMIG_TYPE_ERROR
   if (callback (data, EMIG_TYPE_ERROR)) return;
   #endif
-  /* OSF/1 */
-  #if defined EMTIMERS
-  if (callback (data, EMTIMERS)) return;
-  #endif
   /* IRIX */
   #if defined EMUSTRUN
   if (callback (data, EMUSTRUN)) return;
@@ -1102,7 +1070,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENONET
   if (callback (data, ENONET)) return;
   #endif
-  /* Linux, HP-UX, IRIX, OSF/1, Solaris, Cygwin */
+  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
   #if defined ENOPKG
   if (callback (data, ENOPKG)) return;
   #endif
@@ -1126,7 +1094,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENOSHARE
   if (callback (data, ENOSHARE)) return;
   #endif
-  /* Linux, HP-UX, OSF/1 */
+  /* Linux, HP-UX */
   #if defined ENOSYM
   if (callback (data, ENOSYM)) return;
   #endif
@@ -1134,7 +1102,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENOTACTIVE
   if (callback (data, ENOTACTIVE)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
   #if defined ENOTBLK
   if (callback (data, ENOTBLK)) return;
   #endif
@@ -1194,23 +1162,23 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EPACKSIZE
   if (callback (data, EPACKSIZE)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
   #if defined EPFNOSUPPORT
   if (callback (data, EPFNOSUPPORT)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, OSF/1, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Minix, Cygwin */
   #if defined EPROCLIM
   if (callback (data, EPROCLIM)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EPROCUNAVAIL
   if (callback (data, EPROCUNAVAIL)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EPROGMISMATCH
   if (callback (data, EPROGMISMATCH)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EPROGUNAVAIL
   if (callback (data, EPROGUNAVAIL)) return;
   #endif
@@ -1226,10 +1194,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ERELOC
   if (callback (data, ERELOC)) return;
   #endif
-  /* OSF/1 */
-  #if defined ERELOCATED
-  if (callback (data, ERELOCATED)) return;
-  #endif
   /* FreeBSD */
   #if defined ERELOOKUP
   if (callback (data, ERELOOKUP)) return;
@@ -1242,7 +1206,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EREMDEV
   if (callback (data, EREMDEV)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
   #if defined EREMOTE
   if (callback (data, EREMOTE)) return;
   #endif
@@ -1254,7 +1218,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EREMOTERELEASE
   if (callback (data, EREMOTERELEASE)) return;
   #endif
-  /* Linux, FreeBSD, AIX, IRIX, OSF/1, Solaris, Minix */
+  /* Linux, FreeBSD, AIX, IRIX, Solaris, Minix */
   #if defined ERESTART
   if (callback (data, ERESTART)) return;
   #endif
@@ -1262,7 +1226,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ERFKILL
   if (callback (data, ERFKILL)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined ERPCMISMATCH
   if (callback (data, ERPCMISMATCH)) return;
   #endif
@@ -1274,7 +1238,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ESHLIBVERS
   if (callback (data, ESHLIBVERS)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
   #if defined ESHUTDOWN
   if (callback (data, ESHUTDOWN)) return;
   #endif
@@ -1282,7 +1246,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ESIGPARM
   if (callback (data, ESIGPARM)) return;
   #endif
-  /* AIX, OSF/1 */
+  /* AIX */
   #if defined ESOFT
   if (callback (data, ESOFT)) return;
   #endif
@@ -1294,15 +1258,11 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ESTRPIPE
   if (callback (data, ESTRPIPE)) return;
   #endif
-  /* OSF/1 */
-  #if defined ESUCCESS
-  if (callback (data, ESUCCESS)) return;
-  #endif
   /* AIX */
   #if defined ESYSERROR
   if (callback (data, ESYSERROR)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
   #if defined ETOOMANYREFS
   if (callback (data, ETOOMANYREFS)) return;
   #endif
@@ -1322,14 +1282,10 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EURG
   if (callback (data, EURG)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
   #if defined EUSERS
   if (callback (data, EUSERS)) return;
   #endif
-  /* OSF/1 */
-  #if defined EVERSION
-  if (callback (data, EVERSION)) return;
-  #endif
   /* IRIX */
   #if defined EWRONGFS
   if (callback (data, EWRONGFS)) return;

diff --git a/lib/strerrorname_np.c b/lib/strerrorname_np.c
index c666bb87b457bd945c98bd6f17d3c2ecbc7f6c8d..a4e2c7af0f974e1708072be1ef25e370fddbb110 100644 (file)
--- a/lib/strerrorname_np.c
+++ b/lib/strerrorname_np.c
@@ -282,10 +282,6 @@ strerrorname_np (int errnum)
     #if defined EADV
     case EADV:            return "EADV";
     #endif
-    /* OSF/1 */
-    #if defined EAIO
-    case EAIO:            return "EAIO";
-    #endif
     /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
     #if defined EAUTH
     case EAUTH:           return "EAUTH";
@@ -346,7 +342,7 @@ strerrorname_np (int errnum)
     #if defined EBADREQUEST
     case EBADREQUEST:     return "EBADREQUEST";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
     #if defined EBADRPC
     case EBADRPC:         return "EBADRPC";
     #endif
@@ -418,10 +414,6 @@ strerrorname_np (int errnum)
     #if defined ECLOCKCPU
     case ECLOCKCPU:       return "ECLOCKCPU";
     #endif
-    /* OSF/1 */
-    #if defined ECLONEME && ECLONEME != ERESTART
-    case ECLONEME:        return "ECLONEME";
-    #endif
     /* Linux, HP-UX, IRIX, Solaris, Cygwin */
     #if defined ECOMM
     case ECOMM:           return "ECOMM";
@@ -478,10 +470,6 @@ strerrorname_np (int errnum)
     #if defined EDIRIOCTL
     case EDIRIOCTL:       return "EDIRIOCTL";
     #endif
-    /* OSF/1 */
-    #if defined EDIRTY
-    case EDIRTY:          return "EDIRTY";
-    #endif
     /* IRIX */
     #if defined EDISJOINT
     case EDISJOINT:       return "EDISJOINT";
@@ -502,10 +490,6 @@ strerrorname_np (int errnum)
     #if defined EDOTDOT
     case EDOTDOT:         return "EDOTDOT";
     #endif
-    /* OSF/1 */
-    #if defined EDUPPKG
-    case EDUPPKG:         return "EDUPPKG";
-    #endif
     /* GNU/Hurd */
     #if defined ED_ALREADY_OPEN
     case ED_ALREADY_OPEN: return "ED_ALREADY_OPEN";
@@ -550,10 +534,6 @@ strerrorname_np (int errnum)
     #if defined EEMPTY
     case EEMPTY:          return "EEMPTY";
     #endif
-    /* OSF/1 */
-    #if defined EEMULATE
-    case EEMULATE:        return "EEMULATE";
-    #endif
     /* IRIX */
     #if defined EENDOFMINOR
     case EENDOFMINOR:     return "EENDOFMINOR";
@@ -562,10 +542,6 @@ strerrorname_np (int errnum)
     #if defined EENQUEUED
     case EENQUEUED:       return "EENQUEUED";
     #endif
-    /* OSF/1 */
-    #if defined EFAIL
-    case EFAIL:           return "EFAIL";
-    #endif
     /* AIX */
     #if defined EFORMAT
     case EFORMAT:         return "EFORMAT";
@@ -582,7 +558,7 @@ strerrorname_np (int errnum)
     #if defined EFSCORRUPTED
     case EFSCORRUPTED:    return "EFSCORRUPTED";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix, Cygwin */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, Cygwin */
     #if defined EFTYPE
     case EFTYPE:          return "EFTYPE";
     #endif
@@ -602,7 +578,7 @@ strerrorname_np (int errnum)
     #if defined EGROUPLOOP
     case EGROUPLOOP:      return "EGROUPLOOP";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
     #if defined EHOSTDOWN
     case EHOSTDOWN:       return "EHOSTDOWN";
     #endif
@@ -618,10 +594,6 @@ strerrorname_np (int errnum)
     #if defined EINIT
     case EINIT:           return "EINIT";
     #endif
-    /* OSF/1 */
-    #if defined EINPROG
-    case EINPROG:         return "EINPROG";
-    #endif
     /* IRIX */
     #if defined EINVALMODE
     case EINVALMODE:      return "EINVALMODE";
@@ -650,7 +622,7 @@ strerrorname_np (int errnum)
     #if defined EJOINED
     case EJOINED:         return "EJOINED";
     #endif
-    /* FreeBSD, OSF/1 */
+    /* FreeBSD */
     #if defined EJUSTRETURN
     case EJUSTRETURN:     return "EJUSTRETURN";
     #endif
@@ -942,7 +914,7 @@ strerrorname_np (int errnum)
     #if defined EMACH_SEND_WILL_NOTIFY
     case EMACH_SEND_WILL_NOTIFY:return "EMACH_SEND_WILL_NOTIFY";
     #endif
-    /* AIX, OSF/1 */
+    /* AIX */
     #if defined EMEDIA
     case EMEDIA:          return "EMEDIA";
     #endif
@@ -1002,10 +974,6 @@ strerrorname_np (int errnum)
     #if defined EMIG_TYPE_ERROR
     case EMIG_TYPE_ERROR: return "EMIG_TYPE_ERROR";
     #endif
-    /* OSF/1 */
-    #if defined EMTIMERS
-    case EMTIMERS:        return "EMTIMERS";
-    #endif
     /* IRIX */
     #if defined EMUSTRUN
     case EMUSTRUN:        return "EMUSTRUN";
@@ -1102,7 +1070,7 @@ strerrorname_np (int errnum)
     #if defined ENONET
     case ENONET:          return "ENONET";
     #endif
-    /* Linux, HP-UX, IRIX, OSF/1, Solaris, Cygwin */
+    /* Linux, HP-UX, IRIX, Solaris, Cygwin */
     #if defined ENOPKG
     case ENOPKG:          return "ENOPKG";
     #endif
@@ -1126,7 +1094,7 @@ strerrorname_np (int errnum)
     #if defined ENOSHARE
     case ENOSHARE:        return "ENOSHARE";
     #endif
-    /* Linux, HP-UX, OSF/1 */
+    /* Linux, HP-UX */
     #if defined ENOSYM
     case ENOSYM:          return "ENOSYM";
     #endif
@@ -1134,7 +1102,7 @@ strerrorname_np (int errnum)
     #if defined ENOTACTIVE
     case ENOTACTIVE:      return "ENOTACTIVE";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
     #if defined ENOTBLK
     case ENOTBLK:         return "ENOTBLK";
     #endif
@@ -1194,23 +1162,23 @@ strerrorname_np (int errnum)
     #if defined EPACKSIZE
     case EPACKSIZE:       return "EPACKSIZE";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
     #if defined EPFNOSUPPORT
     case EPFNOSUPPORT:    return "EPFNOSUPPORT";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, OSF/1, Minix, Cygwin */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Minix, Cygwin */
     #if defined EPROCLIM
     case EPROCLIM:        return "EPROCLIM";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
     #if defined EPROCUNAVAIL
     case EPROCUNAVAIL:    return "EPROCUNAVAIL";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
     #if defined EPROGMISMATCH
     case EPROGMISMATCH:   return "EPROGMISMATCH";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
     #if defined EPROGUNAVAIL
     case EPROGUNAVAIL:    return "EPROGUNAVAIL";
     #endif
@@ -1226,10 +1194,6 @@ strerrorname_np (int errnum)
     #if defined ERELOC
     case ERELOC:          return "ERELOC";
     #endif
-    /* OSF/1 */
-    #if defined ERELOCATED
-    case ERELOCATED:      return "ERELOCATED";
-    #endif
     /* FreeBSD */
     #if defined ERELOOKUP
     case ERELOOKUP:       return "ERELOOKUP";
@@ -1242,7 +1206,7 @@ strerrorname_np (int errnum)
     #if defined EREMDEV
     case EREMDEV:         return "EREMDEV";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
     #if defined EREMOTE
     case EREMOTE:         return "EREMOTE";
     #endif
@@ -1254,7 +1218,7 @@ strerrorname_np (int errnum)
     #if defined EREMOTERELEASE
     case EREMOTERELEASE:  return "EREMOTERELEASE";
     #endif
-    /* Linux, FreeBSD, AIX, IRIX, OSF/1, Solaris, Minix */
+    /* Linux, FreeBSD, AIX, IRIX, Solaris, Minix */
     #if defined ERESTART
     case ERESTART:        return "ERESTART";
     #endif
@@ -1262,7 +1226,7 @@ strerrorname_np (int errnum)
     #if defined ERFKILL
     case ERFKILL:         return "ERFKILL";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
     #if defined ERPCMISMATCH
     case ERPCMISMATCH:    return "ERPCMISMATCH";
     #endif
@@ -1274,7 +1238,7 @@ strerrorname_np (int errnum)
     #if defined ESHLIBVERS
     case ESHLIBVERS:      return "ESHLIBVERS";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
     #if defined ESHUTDOWN
     case ESHUTDOWN:       return "ESHUTDOWN";
     #endif
@@ -1282,7 +1246,7 @@ strerrorname_np (int errnum)
     #if defined ESIGPARM
     case ESIGPARM:        return "ESIGPARM";
     #endif
-    /* AIX, OSF/1 */
+    /* AIX */
     #if defined ESOFT
     case ESOFT:           return "ESOFT";
     #endif
@@ -1294,15 +1258,11 @@ strerrorname_np (int errnum)
     #if defined ESTRPIPE
     case ESTRPIPE:        return "ESTRPIPE";
     #endif
-    /* OSF/1 */
-    #if defined ESUCCESS
-    case ESUCCESS:        return "ESUCCESS";
-    #endif
     /* AIX */
     #if defined ESYSERROR
     case ESYSERROR:       return "ESYSERROR";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
     #if defined ETOOMANYREFS
     case ETOOMANYREFS:    return "ETOOMANYREFS";
     #endif
@@ -1322,14 +1282,10 @@ strerrorname_np (int errnum)
     #if defined EURG
     case EURG:            return "EURG";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
     #if defined EUSERS
     case EUSERS:          return "EUSERS";
     #endif
-    /* OSF/1 */
-    #if defined EVERSION
-    case EVERSION:        return "EVERSION";
-    #endif
     /* IRIX */
     #if defined EWRONGFS
     case EWRONGFS:        return "EWRONGFS";

diff --git a/tests/test-strerrorname_np.c b/tests/test-strerrorname_np.c
index cfcfed80a0a37d22aee6b67bfc8c3bc937aca1ad..69f5935bf24d05569eb2e17e83f5360ea0367381 100644 (file)
--- a/tests/test-strerrorname_np.c
+++ b/tests/test-strerrorname_np.c
@@ -281,10 +281,6 @@ main (void)
   #if defined EADV
   ASSERT (strcmp (strerrorname_np (EADV), "EADV") == 0);
   #endif
-  /* OSF/1 */
-  #if defined EAIO
-  ASSERT (strcmp (strerrorname_np (EAIO), "EAIO") == 0);
-  #endif
   /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EAUTH
   ASSERT (strcmp (strerrorname_np (EAUTH), "EAUTH") == 0);
@@ -345,7 +341,7 @@ main (void)
   #if defined EBADREQUEST
   ASSERT (strcmp (strerrorname_np (EBADREQUEST), "EBADREQUEST") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EBADRPC
   ASSERT (strcmp (strerrorname_np (EBADRPC), "EBADRPC") == 0);
   #endif
@@ -417,10 +413,6 @@ main (void)
   #if defined ECLOCKCPU
   ASSERT (strcmp (strerrorname_np (ECLOCKCPU), "ECLOCKCPU") == 0);
   #endif
-  /* OSF/1 */
-  #if defined ECLONEME && ECLONEME != ERESTART
-  ASSERT (strcmp (strerrorname_np (ECLONEME), "ECLONEME") == 0);
-  #endif
   /* Linux, HP-UX, IRIX, Solaris, Cygwin */
   #if defined ECOMM
   ASSERT (strcmp (strerrorname_np (ECOMM), "ECOMM") == 0);
@@ -477,10 +469,6 @@ main (void)
   #if defined EDIRIOCTL
   ASSERT (strcmp (strerrorname_np (EDIRIOCTL), "EDIRIOCTL") == 0);
   #endif
-  /* OSF/1 */
-  #if defined EDIRTY
-  ASSERT (strcmp (strerrorname_np (EDIRTY), "EDIRTY") == 0);
-  #endif
   /* IRIX */
   #if defined EDISJOINT
   ASSERT (strcmp (strerrorname_np (EDISJOINT), "EDISJOINT") == 0);
@@ -501,10 +489,6 @@ main (void)
   #if defined EDOTDOT
   ASSERT (strcmp (strerrorname_np (EDOTDOT), "EDOTDOT") == 0);
   #endif
-  /* OSF/1 */
-  #if defined EDUPPKG
-  ASSERT (strcmp (strerrorname_np (EDUPPKG), "EDUPPKG") == 0);
-  #endif
   /* GNU/Hurd */
   #if defined ED_ALREADY_OPEN
   ASSERT (strcmp (strerrorname_np (ED_ALREADY_OPEN), "ED_ALREADY_OPEN") == 0);
@@ -549,10 +533,6 @@ main (void)
   #if defined EEMPTY
   ASSERT (strcmp (strerrorname_np (EEMPTY), "EEMPTY") == 0);
   #endif
-  /* OSF/1 */
-  #if defined EEMULATE
-  ASSERT (strcmp (strerrorname_np (EEMULATE), "EEMULATE") == 0);
-  #endif
   /* IRIX */
   #if defined EENDOFMINOR
   ASSERT (strcmp (strerrorname_np (EENDOFMINOR), "EENDOFMINOR") == 0);
@@ -561,10 +541,6 @@ main (void)
   #if defined EENQUEUED
   ASSERT (strcmp (strerrorname_np (EENQUEUED), "EENQUEUED") == 0);
   #endif
-  /* OSF/1 */
-  #if defined EFAIL
-  ASSERT (strcmp (strerrorname_np (EFAIL), "EFAIL") == 0);
-  #endif
   /* AIX */
   #if defined EFORMAT
   ASSERT (strcmp (strerrorname_np (EFORMAT), "EFORMAT") == 0);
@@ -581,7 +557,7 @@ main (void)
   #if defined EFSCORRUPTED
   ASSERT (strcmp (strerrorname_np (EFSCORRUPTED), "EFSCORRUPTED") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, Cygwin */
   #if defined EFTYPE
   ASSERT (strcmp (strerrorname_np (EFTYPE), "EFTYPE") == 0);
   #endif
@@ -601,7 +577,7 @@ main (void)
   #if defined EGROUPLOOP
   ASSERT (strcmp (strerrorname_np (EGROUPLOOP), "EGROUPLOOP") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
   #if defined EHOSTDOWN
   ASSERT (strcmp (strerrorname_np (EHOSTDOWN), "EHOSTDOWN") == 0);
   #endif
@@ -617,10 +593,6 @@ main (void)
   #if defined EINIT
   ASSERT (strcmp (strerrorname_np (EINIT), "EINIT") == 0);
   #endif
-  /* OSF/1 */
-  #if defined EINPROG
-  ASSERT (strcmp (strerrorname_np (EINPROG), "EINPROG") == 0);
-  #endif
   /* IRIX */
   #if defined EINVALMODE
   ASSERT (strcmp (strerrorname_np (EINVALMODE), "EINVALMODE") == 0);
@@ -649,7 +621,7 @@ main (void)
   #if defined EJOINED
   ASSERT (strcmp (strerrorname_np (EJOINED), "EJOINED") == 0);
   #endif
-  /* FreeBSD, OSF/1 */
+  /* FreeBSD */
   #if defined EJUSTRETURN
   ASSERT (strcmp (strerrorname_np (EJUSTRETURN), "EJUSTRETURN") == 0);
   #endif
@@ -941,7 +913,7 @@ main (void)
   #if defined EMACH_SEND_WILL_NOTIFY
   ASSERT (strcmp (strerrorname_np (EMACH_SEND_WILL_NOTIFY), "EMACH_SEND_WILL_NOTIFY") == 0);
   #endif
-  /* AIX, OSF/1 */
+  /* AIX */
   #if defined EMEDIA
   ASSERT (strcmp (strerrorname_np (EMEDIA), "EMEDIA") == 0);
   #endif
@@ -1001,10 +973,6 @@ main (void)
   #if defined EMIG_TYPE_ERROR
   ASSERT (strcmp (strerrorname_np (EMIG_TYPE_ERROR), "EMIG_TYPE_ERROR") == 0);
   #endif
-  /* OSF/1 */
-  #if defined EMTIMERS
-  ASSERT (strcmp (strerrorname_np (EMTIMERS), "EMTIMERS") == 0);
-  #endif
   /* IRIX */
   #if defined EMUSTRUN
   ASSERT (strcmp (strerrorname_np (EMUSTRUN), "EMUSTRUN") == 0);
@@ -1101,7 +1069,7 @@ main (void)
   #if defined ENONET
   ASSERT (strcmp (strerrorname_np (ENONET), "ENONET") == 0);
   #endif
-  /* Linux, HP-UX, IRIX, OSF/1, Solaris, Cygwin */
+  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
   #if defined ENOPKG
   ASSERT (strcmp (strerrorname_np (ENOPKG), "ENOPKG") == 0);
   #endif
@@ -1125,7 +1093,7 @@ main (void)
   #if defined ENOSHARE
   ASSERT (strcmp (strerrorname_np (ENOSHARE), "ENOSHARE") == 0);
   #endif
-  /* Linux, HP-UX, OSF/1 */
+  /* Linux, HP-UX */
   #if defined ENOSYM
   ASSERT (strcmp (strerrorname_np (ENOSYM), "ENOSYM") == 0);
   #endif
@@ -1133,7 +1101,7 @@ main (void)
   #if defined ENOTACTIVE
   ASSERT (strcmp (strerrorname_np (ENOTACTIVE), "ENOTACTIVE") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
   #if defined ENOTBLK
   ASSERT (strcmp (strerrorname_np (ENOTBLK), "ENOTBLK") == 0);
   #endif
@@ -1193,23 +1161,23 @@ main (void)
   #if defined EPACKSIZE
   ASSERT (strcmp (strerrorname_np (EPACKSIZE), "EPACKSIZE") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
   #if defined EPFNOSUPPORT
   ASSERT (strcmp (strerrorname_np (EPFNOSUPPORT), "EPFNOSUPPORT") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, OSF/1, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Minix, Cygwin */
   #if defined EPROCLIM
   ASSERT (strcmp (strerrorname_np (EPROCLIM), "EPROCLIM") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EPROCUNAVAIL
   ASSERT (strcmp (strerrorname_np (EPROCUNAVAIL), "EPROCUNAVAIL") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EPROGMISMATCH
   ASSERT (strcmp (strerrorname_np (EPROGMISMATCH), "EPROGMISMATCH") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined EPROGUNAVAIL
   ASSERT (strcmp (strerrorname_np (EPROGUNAVAIL), "EPROGUNAVAIL") == 0);
   #endif
@@ -1225,10 +1193,6 @@ main (void)
   #if defined ERELOC
   ASSERT (strcmp (strerrorname_np (ERELOC), "ERELOC") == 0);
   #endif
-  /* OSF/1 */
-  #if defined ERELOCATED
-  ASSERT (strcmp (strerrorname_np (ERELOCATED), "ERELOCATED") == 0);
-  #endif
   /* FreeBSD */
   #if defined ERELOOKUP
   ASSERT (strcmp (strerrorname_np (ERELOOKUP), "ERELOOKUP") == 0);
@@ -1241,7 +1205,7 @@ main (void)
   #if defined EREMDEV
   ASSERT (strcmp (strerrorname_np (EREMDEV), "EREMDEV") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
   #if defined EREMOTE
   ASSERT (strcmp (strerrorname_np (EREMOTE), "EREMOTE") == 0);
   #endif
@@ -1253,7 +1217,7 @@ main (void)
   #if defined EREMOTERELEASE
   ASSERT (strcmp (strerrorname_np (EREMOTERELEASE), "EREMOTERELEASE") == 0);
   #endif
-  /* Linux, FreeBSD, AIX, IRIX, OSF/1, Solaris, Minix */
+  /* Linux, FreeBSD, AIX, IRIX, Solaris, Minix */
   #if defined ERESTART
   ASSERT (strcmp (strerrorname_np (ERESTART), "ERESTART") == 0);
   #endif
@@ -1261,7 +1225,7 @@ main (void)
   #if defined ERFKILL
   ASSERT (strcmp (strerrorname_np (ERFKILL), "ERFKILL") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, OSF/1, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix */
   #if defined ERPCMISMATCH
   ASSERT (strcmp (strerrorname_np (ERPCMISMATCH), "ERPCMISMATCH") == 0);
   #endif
@@ -1273,7 +1237,7 @@ main (void)
   #if defined ESHLIBVERS
   ASSERT (strcmp (strerrorname_np (ESHLIBVERS), "ESHLIBVERS") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
   #if defined ESHUTDOWN
   ASSERT (strcmp (strerrorname_np (ESHUTDOWN), "ESHUTDOWN") == 0);
   #endif
@@ -1281,11 +1245,11 @@ main (void)
   #if defined ESIGPARM
   ASSERT (strcmp (strerrorname_np (ESIGPARM), "ESIGPARM") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
   #if defined ESOCKTNOSUPPORT
   ASSERT (strcmp (strerrorname_np (ESOCKTNOSUPPORT), "ESOCKTNOSUPPORT") == 0);
   #endif
-  /* AIX, OSF/1 */
+  /* AIX */
   #if defined ESOFT
   ASSERT (strcmp (strerrorname_np (ESOFT), "ESOFT") == 0);
   #endif
@@ -1297,15 +1261,11 @@ main (void)
   #if defined ESTRPIPE
   ASSERT (strcmp (strerrorname_np (ESTRPIPE), "ESTRPIPE") == 0);
   #endif
-  /* OSF/1 */
-  #if defined ESUCCESS
-  ASSERT (strcmp (strerrorname_np (ESUCCESS), "ESUCCESS") == 0);
-  #endif
   /* AIX */
   #if defined ESYSERROR
   ASSERT (strcmp (strerrorname_np (ESYSERROR), "ESYSERROR") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
   #if defined ETOOMANYREFS
   ASSERT (strcmp (strerrorname_np (ETOOMANYREFS), "ETOOMANYREFS") == 0);
   #endif
@@ -1325,14 +1285,10 @@ main (void)
   #if defined EURG
   ASSERT (strcmp (strerrorname_np (EURG), "EURG") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, OSF/1, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
   #if defined EUSERS
   ASSERT (strcmp (strerrorname_np (EUSERS), "EUSERS") == 0);
   #endif
-  /* OSF/1 */
-  #if defined EVERSION
-  ASSERT (strcmp (strerrorname_np (EVERSION), "EVERSION") == 0);
-  #endif
   /* IRIX */
   #if defined EWRONGFS
   ASSERT (strcmp (strerrorname_np (EWRONGFS), "EWRONGFS") == 0);