diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 14:37:09 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 14:37:09 +0200 |
commit | e82c6eec6f91e9c212103d81fdd4b10028c9bf6a (patch) | |
tree | 157a358cdef97a1d5e97e9b446b9bf7ccfa95d26 /syslogd.c | |
parent | 61ba5ff5955742b68a24d7b135ad07c29b48fa2f (diff) | |
parent | b9198d251218f13803cf121c4ef5f69a0e850d24 (diff) | |
download | rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.gz rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.bz2 rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.zip |
Merge branch 'bsd-port'
Conflicts:
ChangeLog
plugins/imklog/imklog.c
Diffstat (limited to 'syslogd.c')
-rw-r--r-- | syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -216,7 +216,7 @@ static rsRetVal GlobalClassExit(void); #if defined(SYSLOGD_PIDNAME) # undef _PATH_LOGPID # if defined(FSSTND) -# ifdef BSD +# ifdef OS_BSD # define _PATH_VARRUN "/var/run/" # endif # if defined(__sun) || defined(__hpux) |