From: Bruno Haible Date: Sun, 11 Oct 2020 18:48:49 +0000 (+0200) Subject: tests: Avoid a name clash on UnixWare. X-Git-Tag: v1.0~3571 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=71eadc062dae52fa784c9a3bbd24d841f265ad4e;p=gnulib.git tests: Avoid a name clash on UnixWare. Reported by Tim Rice in . * tests/nap.h (nap): Define as gl_nap on OpenServer and UnixWare. --- diff --git a/ChangeLog b/ChangeLog index 22f79fb09f..14dc601caa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-10-11 Bruno Haible + + tests: Avoid a name clash on UnixWare. + Reported by Tim Rice in + . + * tests/nap.h (nap): Define as gl_nap on OpenServer and UnixWare. + 2020-10-11 Bruno Haible stdioext: Update comments regarding UnixWare. diff --git a/tests/nap.h b/tests/nap.h index 5dd264f6df..c27e538ccd 100644 --- a/tests/nap.h +++ b/tests/nap.h @@ -24,6 +24,13 @@ # include +/* Avoid a conflict with a function called nap() on UnixWare. */ +# if defined _SCO_DS || (defined __SCO_VERSION__ || defined __sysv5__) /* OpenServer, UnixWare */ +# include +# undef nap +# define nap gl_nap +# endif + /* Name of the witness file. */ #define TEMPFILE BASE "nap.tmp"