#5910: Fix autotools build (#2) and workaround MSVC bug

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index cedca9ee60a0e525e1a91c25003a323059f9bc0d..fc0b7b1992256e1345265005f876a1609ef932e6 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -35,7 +35,7 @@ LDADD = \
     ${LIBM}
 
 noinst_HEADERS = \
-    daemon.h
+    daemon.h \
     watch.h
 
 transmission_daemon_SOURCES = daemon.c watch.c

diff --git a/daemon/daemon-win32.c b/daemon/daemon-win32.c
index 4b66fce0c8b0715694db574bb23f0f5c009250e2..cedbb21d7136c9db921d8676a2cb51e3242a9a8d 100644 (file)
--- a/daemon/daemon-win32.c
+++ b/daemon/daemon-win32.c
@@ -130,7 +130,9 @@ static void
 stop_service (void)
 {
   if (service_stop_thread != NULL)
-    return;
+    {
+      return;
+    }
 
   const DWORD wait_time = 30 * 1000;