diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-04-05 17:47:05 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-04-05 17:47:05 +0200 |
| commit | 49fd88f0309a129872a405617b51b87d4edde43d (patch) | |
| tree | 985d44ff0c6f8bc0bc6e57a2ee17e7792ae0264f | |
| parent | 514bdc3f7f0f38fd39b7e0ee6a59c4e2708923ec (diff) | |
| download | gnulib-49fd88f0309a129872a405617b51b87d4edde43d.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/strerrorname_np.c | 2 | ||||
| -rw-r--r-- | tests/test-strerrorname_np.c | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2023-04-05 Bruno Haible <bruno@clisp.org> + 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 <bruno@clisp.org> + uchar: Fix recent change. * lib/uchar.in.h: Include <string.h>, <wctype.h>. 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 */ |