diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
| commit | de71589ca3145dfbe8e34790bb49e3d86d3d3bce (patch) | |
| tree | 43a91ec3d4c7306c9ddda820b916e8da71b3d065 /runtime/syslogd-types.h | |
| parent | 2f4292a81c2bf89b349f0e276c69616ac6e51164 (diff) | |
| parent | 8939ccfffd3a0580ead376234ad64a9602d4e4e6 (diff) | |
| download | rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.gz rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.xz rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.zip | |
Merge branch 'v6-stable'
Conflicts:
ChangeLog
configure.ac
runtime/ruleset.c
tools/syslogd.c
Diffstat (limited to 'runtime/syslogd-types.h')
| -rw-r--r-- | runtime/syslogd-types.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/syslogd-types.h b/runtime/syslogd-types.h index 30ce896a..6947a110 100644 --- a/runtime/syslogd-types.h +++ b/runtime/syslogd-types.h @@ -31,8 +31,9 @@ #include <syslog.h> #endif -#define FALSE 0 -#define TRUE 1 +/* we use RSTRUE/FALSE to prevent name claches with other packages */ +#define RSFALSE 0 +#define RSTRUE 1 #ifdef UT_NAMESIZE # define UNAMESZ UT_NAMESIZE /* length of a login name */ |