aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/daemon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r--src/microhttpd/daemon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 36c67074..23f06baa 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3902,7 +3902,7 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
3902 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); 3902 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
3903 if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) && 3903 if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
3904 (! pos->thread_joined) && 3904 (! pos->thread_joined) &&
3905 (! MHD_join_thread_ (pos->tid.handle)) ) 3905 (! MHD_join_thread_tid_ (&pos->tid)) )
3906 MHD_PANIC (_ ("Failed to join a thread.\n")); 3906 MHD_PANIC (_ ("Failed to join a thread.\n"));
3907#endif 3907#endif
3908#ifdef UPGRADE_SUPPORT 3908#ifdef UPGRADE_SUPPORT
@@ -8288,7 +8288,7 @@ close_all_connections (struct MHD_Daemon *daemon)
8288 * MHD_resume_connection() during finishing of "upgraded" 8288 * MHD_resume_connection() during finishing of "upgraded"
8289 * thread. */ 8289 * thread. */
8290 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); 8290 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
8291 if (! MHD_join_thread_ (pos->tid.handle)) 8291 if (! MHD_join_thread_tid_ (&pos->tid))
8292 MHD_PANIC (_ ("Failed to join a thread.\n")); 8292 MHD_PANIC (_ ("Failed to join a thread.\n"));
8293 pos->thread_joined = true; 8293 pos->thread_joined = true;
8294 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex); 8294 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
@@ -8320,7 +8320,7 @@ close_all_connections (struct MHD_Daemon *daemon)
8320 if (! pos->thread_joined) 8320 if (! pos->thread_joined)
8321 { 8321 {
8322 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex); 8322 MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
8323 if (! MHD_join_thread_ (pos->tid.handle)) 8323 if (! MHD_join_thread_tid_ (&pos->tid))
8324 MHD_PANIC (_ ("Failed to join a thread.\n")); 8324 MHD_PANIC (_ ("Failed to join a thread.\n"));
8325 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex); 8325 MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
8326 pos->thread_joined = true; 8326 pos->thread_joined = true;
@@ -8458,7 +8458,7 @@ MHD_stop_daemon (struct MHD_Daemon *daemon)
8458 mhd_assert (false); /* Should never happen */ 8458 mhd_assert (false); /* Should never happen */
8459 } 8459 }
8460 8460
8461 if (! MHD_join_thread_ (daemon->tid.handle)) 8461 if (! MHD_join_thread_tid_ (&daemon->tid))
8462 { 8462 {
8463 MHD_PANIC (_ ("Failed to join a thread.\n")); 8463 MHD_PANIC (_ ("Failed to join a thread.\n"));
8464 } 8464 }