--- qsampler/trunk/src/qsamplerMainForm.cpp 2019/04/01 22:36:26 3508 +++ qsampler/trunk/src/qsamplerMainForm.cpp 2019/04/10 23:03:23 3510 @@ -68,10 +68,6 @@ } #endif -#ifdef HAVE_SIGNAL_H -#include -#endif - #ifdef CONFIG_LIBGIG #include #endif @@ -93,6 +89,7 @@ // All winsock apps needs this. #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) static WSADATA _wsaData; +#undef HAVE_SIGNAL_H #endif @@ -103,13 +100,13 @@ #include +#include #include #include - #include // File descriptor for SIGUSR1 notifier. -static int g_fdSigusr1[2]; +static int g_fdSigusr1[2] = { -1, -1 }; // Unix SIGUSR1 signal handler. static void qsampler_sigusr1_handler ( int /* signo */ ) @@ -120,7 +117,7 @@ } // File descriptor for SIGTERM notifier. -static int g_fdSigterm[2]; +static int g_fdSigterm[2] = { -1, -1 }; // Unix SIGTERM signal handler. static void qsampler_sigterm_handler ( int /* signo */ ) @@ -253,12 +250,12 @@ SLOT(handle_sigusr1())); // Install SIGUSR1 signal handler. - struct sigaction sigusr1; - sigusr1.sa_handler = qsampler_sigusr1_handler; - sigemptyset(&sigusr1.sa_mask); - sigusr1.sa_flags = 0; - sigusr1.sa_flags |= SA_RESTART; - ::sigaction(SIGUSR1, &sigusr1, NULL); + struct sigaction sigusr1; + sigusr1.sa_handler = qsampler_sigusr1_handler; + sigemptyset(&sigusr1.sa_mask); + sigusr1.sa_flags = 0; + sigusr1.sa_flags |= SA_RESTART; + ::sigaction(SIGUSR1, &sigusr1, NULL); // Initialize file descriptors for SIGTERM socket notifier. ::socketpair(AF_UNIX, SOCK_STREAM, 0, g_fdSigterm);