diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-12 12:39:10 +0200 |
commit | 2a2a9716f7ee0debd192e75785e347f4e4af0b4d (patch) | |
tree | 8d8fef67d1c7bdf11bd193f3ce93dae8e9530ba4 /runtime/datetime.c | |
parent | 3b63b155ed5e4d58858baa3d6f07293099d8a4e5 (diff) | |
parent | 20607ba1695b99838db7bdf809b22cf52bbdf5ce (diff) | |
download | rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.gz rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.bz2 rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.zip |
Merge branch 'master-newconf'
Conflicts:
ChangeLog
tools/omfile.c
Diffstat (limited to 'runtime/datetime.c')
-rw-r--r-- | runtime/datetime.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/runtime/datetime.c b/runtime/datetime.c index 89452f1c..753d2068 100644 --- a/runtime/datetime.c +++ b/runtime/datetime.c @@ -40,7 +40,6 @@ #include "obj.h" #include "modules.h" #include "datetime.h" -#include "sysvar.h" #include "srUtils.h" #include "stringbuf.h" #include "errmsg.h" |