diff options
| author | Matt Lewandowsky <[email protected]> | 2013-09-11 05:12:32 -0700 |
|---|---|---|
| committer | Matt Lewandowsky <[email protected]> | 2013-09-11 23:19:25 -0700 |
| commit | 814d38ee1a111caf81e066d290fec455d13dcc9b (patch) | |
| tree | 30a7b4c92503eccfc779b3f1904fa5f3a7c636fe /erts/etc/unix | |
| parent | b44ce0f1b70176bba8ce817d9889ace9efaec891 (diff) | |
| download | otp-814d38ee1a111caf81e066d290fec455d13dcc9b.tar.gz otp-814d38ee1a111caf81e066d290fec455d13dcc9b.tar.bz2 otp-814d38ee1a111caf81e066d290fec455d13dcc9b.zip | |
Fix syslog defines
config.h defines HAVE_SYSLOG_H whereas the sources are looking for
NO_SYSLOG to be undefined. As the logic of "if feature is available"
makes more sense than "if feature is not unavailable", I opted for the
config.h define.
Diffstat (limited to 'erts/etc/unix')
| -rw-r--r-- | erts/etc/unix/run_erl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index b69e31f784..c9b2321ab0 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -60,7 +60,7 @@ #include <dirent.h> #include <termios.h> #include <time.h> -#ifndef NO_SYSLOG +#ifdef HAVE_SYSLOG_H # include <syslog.h> #endif #ifdef HAVE_PTY_H @@ -197,7 +197,7 @@ static char* outbuf_in; #endif -#ifdef NO_SYSLOG +#ifndef HAVE_SYSLOG_H # define OPEN_SYSLOG() ((void) 0) #else # define OPEN_SYSLOG() openlog(simple_basename(program_name), \ @@ -415,7 +415,7 @@ int main(int argc, char **argv) } #endif -#ifndef NO_SYSLOG +#ifdef HAVE_SYSLOG_H /* Before fiddling with file descriptors we make sure syslog is turned off or "closed". In the single case where we might want it again, we will open it again instead. Would not want syslog to @@ -1163,7 +1163,7 @@ static void error_logf(int priority, int line, const char *format, ...) va_list args; va_start(args, format); -#ifndef NO_SYSLOG +#ifdef HAVE_SYSLOG_H if (run_daemon) { vsyslog(priority,format,args); } |