Rename daemon() to start_daemon().

daemon() conflicted with the standard library function, which is
included by default on OS X.
This commit is contained in:
John "Elwin" Edwards 2013-09-07 08:08:00 -04:00
parent 05b8759305
commit 720d587422
12 changed files with 25 additions and 25 deletions

View file

@ -85,10 +85,10 @@ int (*func)();
}
/*
* daemon:
* start_daemon:
* Start a daemon, takes a function.
*/
daemon(func, arg, type)
start_daemon(func, arg, type)
int arg, type, (*func)();
{
d_insert(func, arg, type, DAEMON);

View file

@ -66,7 +66,7 @@ int fromfuse;
swander(fromfuse)
int fromfuse;
{
daemon(rollwand, TRUE, AFTER);
start_daemon(rollwand, TRUE, AFTER);
}

View file

@ -243,15 +243,15 @@ char **envp;
/* Start up daemons and fuses */
daemon(status, TRUE, BEFORE);
daemon(runners, TRUE, AFTER);
start_daemon(status, TRUE, BEFORE);
start_daemon(runners, TRUE, AFTER);
/*
* These daemons have been moved to AFTER because BEFORE daemons
* get called every command, even invalid ones. Hopefully this
* won't break anything.
*/
daemon(doctor, TRUE, AFTER);
daemon(stomach, TRUE, AFTER);
start_daemon(doctor, TRUE, AFTER);
start_daemon(stomach, TRUE, AFTER);
fuse(swander, TRUE, WANDERTIME);
/* Give the rogue his weaponry */