Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-10-01 17:44:46 +01:00
commit 0482dc7546
1 changed files with 5 additions and 0 deletions

View File

@ -16,6 +16,8 @@
#include <stdbool.h>
#include <stdlib.h>
#include <sys/time.h>
#include <unistd.h>
#include <fcntl.h>
#include "util.h"
#include "log.h"
@ -41,6 +43,9 @@ void init_logging() {
}
errorfile = fopen(errorfilename, "w");
if (fcntl(fileno(errorfile), F_SETFD, FD_CLOEXEC)) {
ELOG("Could not set close-on-exec flag\n");
}
}
/*