merge-recursive: drop several unused parameters

diff --git a/compat/mingw.c b/compat/mingw.c
index 0af86840197deb3b0b9d442e3e5236170c31a4de..4276297595e21064abe2c0fb496f90d39455e200 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2175,7 +2175,7 @@ static void stop_timer_thread(void)
        if (timer_event)
                SetEvent(timer_event);  /* tell thread to terminate */
        if (timer_thread) {
-               int rc = WaitForSingleObject(timer_thread, 1000);
+               int rc = WaitForSingleObject(timer_thread, 10000);
                if (rc == WAIT_TIMEOUT)
                        error("timer thread did not terminate timely");
                else if (rc != WAIT_OBJECT_0)