From da2c4730f60aa5ab96226ff49261d2db5714a9b7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 24 Dec 2021 18:50:45 +0100 Subject: [PATCH] strerrorname_np: Fix compilation error on IRIX. * lib/strerrorname_np.c (strerrorname_np): Handle conflict between EDIRCORRUPTED and EFSCORRUPTED. * tests/test-strerrorname_np.c (main): Likewise. --- ChangeLog | 7 +++++++ lib/strerrorname_np.c | 2 +- tests/test-strerrorname_np.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8ffa3907f..32174c29e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-12-24 Bruno Haible + + strerrorname_np: Fix compilation error on IRIX. + * lib/strerrorname_np.c (strerrorname_np): Handle conflict between + EDIRCORRUPTED and EFSCORRUPTED. + * tests/test-strerrorname_np.c (main): Likewise. + 2021-12-24 Bruno Haible hamt: Fix compilation error on NetBSD 7. diff --git a/lib/strerrorname_np.c b/lib/strerrorname_np.c index a39270060e..8b602e7418 100644 --- a/lib/strerrorname_np.c +++ b/lib/strerrorname_np.c @@ -464,7 +464,7 @@ strerrorname_np (int errnum) case EDIED: return "EDIED"; #endif /* IRIX */ - #if defined EDIRCORRUPTED + #if defined EDIRCORRUPTED && EDIRCORRUPTED != EFSCORRUPTED case EDIRCORRUPTED: return "EDIRCORRUPTED"; #endif /* FreeBSD */ diff --git a/tests/test-strerrorname_np.c b/tests/test-strerrorname_np.c index e6f57c558b..b765849135 100644 --- a/tests/test-strerrorname_np.c +++ b/tests/test-strerrorname_np.c @@ -466,7 +466,7 @@ main (void) ASSERT (strcmp (strerrorname_np (EDIED), "EDIED") == 0); #endif /* IRIX */ - #if defined EDIRCORRUPTED + #if defined EDIRCORRUPTED && EDIRCORRUPTED != EFSCORRUPTED ASSERT (strcmp (strerrorname_np (EDIRCORRUPTED), "EDIRCORRUPTED") == 0); #endif /* FreeBSD */ -- 2.39.5