diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 16:58:15 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 16:58:15 +0200 |
| commit | c5178a4d21cf8ca3362b8a8394d0e762801550a4 (patch) | |
| tree | 0916303e0cd18e00397a6eb28a64b32aa5908c4d /omusrmsg.c | |
| parent | 65cdfc1777e1c189f28dfe11fa1ab0d08930b458 (diff) | |
| parent | 11a526bcee95dab6a5bf2cc25a07dc6d65eaa177 (diff) | |
| download | rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.tar.gz rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.tar.xz rsyslog-c5178a4d21cf8ca3362b8a8394d0e762801550a4.zip | |
Merge branch 'master' into beta
3.17.x is the new beta
Conflicts:
ChangeLog
configure.ac
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 |