From 49fd88f0309a129872a405617b51b87d4edde43d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 5 Apr 2023 17:47:05 +0200 Subject: strerrorname_np: Fix compilation error on Haiku. * lib/strerrorname_np.c (strerrorname_np): Avoid conflict between EDOOFUS and EINVAL. * 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 94cecfb730..25417127c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-04-05 Bruno Haible + + strerrorname_np: Fix compilation error on Haiku. + * lib/strerrorname_np.c (strerrorname_np): Avoid conflict between + EDOOFUS and EINVAL. + * tests/test-strerrorname_np.c (main): Likewise. + 2023-04-05 Bruno Haible uchar: Fix recent change. diff --git a/lib/strerrorname_np.c b/lib/strerrorname_np.c index f8c4634c36..6bbb84f044 100644 --- a/lib/strerrorname_np.c +++ b/lib/strerrorname_np.c @@ -488,7 +488,7 @@ strerrorname_np (int errnum) case EDONTREPLY: return "EDONTREPLY"; #endif /* FreeBSD */ - #if defined EDOOFUS + #if defined EDOOFUS && EDOOFUS != EINVAL case EDOOFUS: return "EDOOFUS"; #endif /* Linux, HP-UX, Cygwin */ diff --git a/tests/test-strerrorname_np.c b/tests/test-strerrorname_np.c index ae2291fd97..49de0c750d 100644 --- a/tests/test-strerrorname_np.c +++ b/tests/test-strerrorname_np.c @@ -490,7 +490,7 @@ main (void) ASSERT (strcmp (strerrorname_np (EDONTREPLY), "EDONTREPLY") == 0); #endif /* FreeBSD */ - #if defined EDOOFUS + #if defined EDOOFUS && EDOOFUS != EINVAL ASSERT (strcmp (strerrorname_np (EDOOFUS), "EDOOFUS") == 0); #endif /* Linux, HP-UX, Cygwin */ -- cgit v1.2.1