--- qsampler/trunk/src/qsamplerMainForm.cpp	2010/07/22 08:12:12	2113
+++ qsampler/trunk/src/qsamplerMainForm.cpp	2011/07/18 08:18:36	2210
@@ -96,7 +96,7 @@
 //-------------------------------------------------------------------------
 // LADISH Level 1 support stuff.
 
-#ifdef HAVE_SIGNAL_H
+#if defined(HAVE_SIGNAL_H) && defined(HAVE_SYS_SOCKET_H)
 
 #include <QSocketNotifier>
 
@@ -202,7 +202,7 @@
 
 	m_iTimerSlot = 0;
 
-#ifdef HAVE_SIGNAL_H
+#if defined(HAVE_SIGNAL_H) && defined(HAVE_SYS_SOCKET_H)
 
 	// Set to ignore any fatal "Broken pipe" signals.
 	::signal(SIGPIPE, SIG_IGN);
@@ -221,7 +221,7 @@
 	// Install SIGUSR1 signal handler.
     struct sigaction usr1;
     usr1.sa_handler = qsampler_sigusr1_handler;
-    ::sigemptyset(&usr1.sa_mask);
+    sigemptyset(&usr1.sa_mask);
     usr1.sa_flags = 0;
     usr1.sa_flags |= SA_RESTART;
     ::sigaction(SIGUSR1, &usr1, NULL);
@@ -403,7 +403,7 @@
 	WSACleanup();
 #endif
 
-#ifdef HAVE_SIGNAL_H
+#if defined(HAVE_SIGNAL_H) && defined(HAVE_SYS_SOCKET_H)
 	if (m_pUsr1Notifier)
 		delete m_pUsr1Notifier;
 #endif
@@ -691,7 +691,7 @@
 // LADISH Level 1 -- SIGUSR1 signal handler.
 void MainForm::handle_sigusr1 (void)
 {
-#ifdef HAVE_SIGNAL_H
+#if defined(HAVE_SIGNAL_H) && defined(HAVE_SYS_SOCKET_H)
 
 	char c;