diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 |
commit | 1d8b9e17ea13630aec475484da09ebba0366f7c8 (patch) | |
tree | 0c801f68561bfb0930a4ade80d7ca3a7940887ab /tests/strerror_r.c | |
parent | 84e26c587987e8484d55db4165f188b40c09e94b (diff) | |
parent | 630f99f29bd31a76d8d24da2975a045452c763ef (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/strerror_r.c')
-rw-r--r-- | tests/strerror_r.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/strerror_r.c b/tests/strerror_r.c index 0cd28ade..87fc1142 100644 --- a/tests/strerror_r.c +++ b/tests/strerror_r.c @@ -34,7 +34,7 @@ #include "strerror-override.h" -#if STRERROR_R_CHAR_P +#if STRERROR_R_CHAR_P && !defined _AIX # if HAVE___XPG_STRERROR_R _GL_EXTERN_C int __xpg_strerror_r (int errnum, char *buf, size_t buflen); @@ -159,7 +159,10 @@ strerror_r (int errnum, char *buf, size_t buflen) int ret; int saved_errno = errno; -#if STRERROR_R_CHAR_P + /* Due to the '#undef strerror_r' above, on AIX, we're always using + the POSIX-compatible strerror_r function, regardless whether + _LINUX_SOURCE_COMPAT is defined or not. */ +#if STRERROR_R_CHAR_P && !defined _AIX { ret = 0; |