[PATCH 1/2] configure: Fix argument type of unw_step().

[Huw Davies]

Signed-off-by: Huw Davies 
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index dfa6b6ac9c..49676f073b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1697,7 +1697,7 @@ then
        [AC_CACHE_CHECK([for unw_step],wine_cv_have_unw_step,
            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY
 #include <libunwind.h>]],
-                [[unw_context_t context; unw_step( &context );]])],
+                [[unw_cursor_t cursor; unw_step( &cursor );]])],
                 [wine_cv_have_unw_step="yes"],[wine_cv_have_unw_step="no"])])
         if test "$wine_cv_have_unw_step" = no -a -n "$UNWIND_LIBS"
         then
@@ -1706,7 +1706,7 @@ then
             AC_CACHE_CHECK([for unw_step in libunwind],wine_cv_have_libunwind_unw_step,
                [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY
 #include <libunwind.h>]],
-                    [[unw_context_t context; unw_step( &context );]])],
+                    [[unw_cursor_t cursor; unw_step( &cursor );]])],
                     [wine_cv_have_libunwind_unw_step="yes"],
                     [wine_cv_have_libunwind_unw_step="no"])])
             LIBS=$save_libs

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=56497

Your paranoid android.

=== debian10 (build log) ===

error: patch failed: configure.ac:1697
Task: Patch failed to apply

=== debian10 (build log) ===

error: patch failed: configure.ac:1697
Task: Patch failed to apply

[Huw Davies]

On Fri, Sep 13, 2019 at 03:11:30AM -0500, Marvin wrote:
> Hi,
>
> While running your changed tests, I think I found new failures.
> Being a bot and all I'm not very good at pattern recognition, so I might be
> wrong, but could you please double-check?
>
> Full results can be found at:
> https://testbot.winehq.org/JobDetails.pl?Key=56497
>
> Your paranoid android.
>
> === debian10 (build log) ===
>
> error: patch failed: configure.ac:1697
> Task: Patch failed to apply

Odd, they apply just fine for me.

Huw.

[Francois Gouget]

On Fri, 13 Sep 2019, Huw Davies wrote:
[...]
> > === debian10 (build log) ===
> >
> > error: patch failed: configure.ac:1697
> > Task: Patch failed to apply
>
> Odd, they apply just fine for me.

I think that was because the TestBot Wine source was out of date.
See https://www.winehq.org/pipermail/wine-devel/2019-September/150805.html

(though it's probably a bit presomptuous to think you did not already 
see it ;-)