[srm-cvs] CVS Update: - one bug fix (line 45 remove ';') and comment out for macosx

Date: Sat Feb 23 20:44:26 CET 2002
User: Dan Kalowsky
Directory: srm/main

Log Message:
 [0.42]
 - one bug fix (line 45 remove ';') and comment out for macosx
 
 
Modified files:
           srm/main/main.c (version: 1.53)

[FILE: /srm/main/main.c]

--- srm/main/main.c:1.52 Sun Feb 10 19:40:28 2002 GMT
+++ srm/main/main.c Sat Feb 23 18:44:26 2002 GMT
@@ -1,4 +1,4 @@
-/* $Id: cvstemp,v 1.52 2002/02/10 20:40:28 derick Exp $ */
+/* $Id: cvstemp,v 1.53 2002/02/23 19:44:26 kalowsky Exp $ */
 
 /* The contents of this file are subject to the Vulcan Logic Public
  * License Version 1.1 (the "License"); you may not use this file
@@ -18,6 +18,7 @@
  *
  * Contributor(s):
  * Derick Rethans <derick@vl-srm.net>
+ * Daniel R. Kalowsky <dank@deadmime.org>
  */
 
 #include <unistd.h>
@@ -42,7 +43,7 @@
 #include "srm_storage.h"
 
 
-BEGIN_INI_ENTRIES;
+BEGIN_INI_ENTRIES
         char *sockname;
         char *logfile;
         srm_ui32 loglevel;
@@ -148,11 +149,13 @@
 void *sig_handler (void *arg)
 {
         sigset_t signal_set;
- int signal;
+ int signal = 0;
 
         while (!srm_shutdown) {
                 sigfillset (&signal_set);
+#if !SRM_MACOSX
                 sigwait (&signal_set, &signal);
+#endif
 
                 pthread_mutex_lock (&mtx_signals);
                 srm_caught_signal = signal;
@@ -228,7 +231,9 @@
         srm_shutdown = FALSE;
         if (srm_no_signal_handling == 0) {
                 sigfillset (&signal_set);
+#if !SRM_MACOSX
                 pthread_sigmask (SIG_BLOCK, &signal_set, NULL);
+#endif
                 pthread_create (&sig_thread, NULL, sig_handler, NULL);
         }
 
Received on Sat Feb 23 21:49:39 2002