Merged changes on `processes.c', `collectd.c' and `collectd.h' from quota-branch...

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index dabc346..ddfb9f2 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -211,7 +211,9 @@ int pidfile_remove (void)
 int main (int argc, char **argv)
 {
        struct sigaction sigIntAction, sigChldAction;
+#if COLLECT_DAEMON
        pid_t pid;
+#endif
 
        char *plugindir = NULL;
        char *basedir = DATADIR;
@@ -314,7 +316,7 @@ int main (int argc, char **argv)
        /*
         * fork off child
         */
-#if DEBUG == 0
+#if COLLECT_DAEMON
        if (daemonize)
        {
                if ((pid = fork ()) == -1)
@@ -358,7 +360,7 @@ int main (int argc, char **argv)
                        return (1);
                }
        } /* if (daemonize) */
-#endif
+#endif /* COLLECT_DAEMON */
 
        /*
         * run the actual loops