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 /omusrmsg.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 'omusrmsg.c')
-rw-r--r-- | omusrmsg.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -119,7 +119,7 @@ static void endtty() * BSD because they are not available there. We only emulate what we actually * need! rgerhards 2005-03-18 */ -#ifdef BSD +#ifdef OS_BSD static FILE *BSD_uf = NULL; void setutent(void) { @@ -145,7 +145,7 @@ void endutent(void) fclose(BSD_uf); BSD_uf = NULL; } -#endif +#endif /* #ifdef OS_BSD */ /* @@ -209,7 +209,7 @@ static rsRetVal wallmsg(uchar* pMsg, instanceData *pData) /* is this slot used? */ if (ut.ut_name[0] == '\0') continue; -#ifndef BSD +#ifndef OS_BSD if (ut.ut_type != USER_PROCESS) continue; #endif |