Re: [PATCH] testsuite: rename `wait' function to `deja_wait'

[Jose E. Marchesi]

OK for both master and maint/poke-4.
Thanks!

> 2024-02-27  Mohammad-Reza Nabipoor  <mnabipoor@gnu.org>
>
>       * testsuite/lib/poke-unit.h (wait): Rename to `deja_wait'.
> ---
>
> Hi Jose.
>
> This fixes problem on Solaris 10 x86_64.
>
>
> Regards,
> Mohammad-Reza
>
>
>  ChangeLog                 |  4 ++++
>  testsuite/lib/poke-unit.h | 18 +++++++++---------
>  2 files changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index 352a9630..b96d1f3b 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,7 @@
> +2024-02-27  Mohammad-Reza Nabipoor  <mnabipoor@gnu.org>
> +
> +     * testsuite/lib/poke-unit.h (wait): Rename to `deja_wait'.
> +
>  2024-02-27  Jose E. Marchesi  <jemarch@gnu.org>
>  
>       * testsuite/poke.libpoke/values.c: Use EXIT_FAILURE instead of 1
> diff --git a/testsuite/lib/poke-unit.h b/testsuite/lib/poke-unit.h
> index fbb546dc..b002ad98 100644
> --- a/testsuite/lib/poke-unit.h
> +++ b/testsuite/lib/poke-unit.h
> @@ -47,8 +47,8 @@ static int xpassed;
>  
>  static char buffer[512];
>  
> -void
> -wait (void)
> +static void
> +deja_wait (void)
>  {
>  #ifdef _DEJAGNU_WAIT_
>    fd_set rfds;
> @@ -72,7 +72,7 @@ pass (const char* fmt, ...)
>    vsnprintf (buffer, sizeof (buffer), fmt, ap);
>    va_end (ap);
>    printf ("\tPASSED: %s\n", buffer);
> -  wait ();
> +  deja_wait ();
>  }
>  
>  static inline void
> @@ -85,7 +85,7 @@ xpass (const char* fmt, ...)
>    vsnprintf (buffer, sizeof (buffer), fmt, ap);
>    va_end (ap);
>    printf ("\tXPASSED: %s\n", buffer);
> -  wait ();
> +  deja_wait ();
>  }
>  
>  static inline void
> @@ -98,7 +98,7 @@ fail (const char* fmt, ...)
>    vsnprintf (buffer, sizeof (buffer), fmt, ap);
>    va_end (ap);
>    printf ("\tFAILED: %s\n", buffer);
> -  wait ();
> +  deja_wait ();
>  }
>  
>  static inline void
> @@ -111,7 +111,7 @@ xfail (const char* fmt, ...)
>    vsnprintf (buffer, sizeof (buffer), fmt, ap);
>    va_end (ap);
>    printf ("\tXFAILED: %s\n", buffer);
> -  wait ();
> +  deja_wait ();
>  }
>  
>  static inline void
> @@ -124,7 +124,7 @@ untested (const char* fmt, ...)
>    vsnprintf (buffer, sizeof (buffer), fmt, ap);
>    va_end (ap);
>    printf ("\tUNTESTED: %s\n", buffer);
> -  wait ();
> +  deja_wait ();
>  }
>  
>  static inline void
> @@ -137,7 +137,7 @@ unresolved (const char* fmt, ...)
>    vsnprintf (buffer, sizeof (buffer), fmt, ap);
>    va_end (ap);
>    printf ("\tUNRESOLVED: %s\n", buffer);
> -  wait ();
> +  deja_wait ();
>  }
>  
>  static inline void
> @@ -149,7 +149,7 @@ note (const char* fmt, ...)
>    vsnprintf (buffer, sizeof (buffer), fmt, ap);
>    va_end (ap);
>    printf ("\tNOTE: %s\n", buffer);
> -  wait ();
> +  deja_wait ();
>  }
>  
>  static inline void