diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 10:38:32 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 10:38:32 +0200 |
commit | c897ac6e6de3b430911cad71e7453d8b4b3c57bc (patch) | |
tree | fd6c2aab0ad78a499ee9053fdd8b17193d8967bd /runtime/datetime.h | |
parent | 78469b4c6a82887c70e2cac365af7a66051f8ba7 (diff) | |
parent | 4c8546fd6fb56d5439edb5a098c8f82bc8fc36aa (diff) | |
download | rsyslog-c897ac6e6de3b430911cad71e7453d8b4b3c57bc.tar.gz rsyslog-c897ac6e6de3b430911cad71e7453d8b4b3c57bc.tar.bz2 rsyslog-c897ac6e6de3b430911cad71e7453d8b4b3c57bc.zip |
Merge branch 'v4-beta' into v4-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/datetime.h')
-rw-r--r-- | runtime/datetime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/datetime.h b/runtime/datetime.h index 58f368e7..8140eb71 100644 --- a/runtime/datetime.h +++ b/runtime/datetime.h @@ -34,8 +34,8 @@ typedef struct datetime_s { /* interfaces */ BEGINinterface(datetime) /* name must also be changed in ENDinterface macro! */ void (*getCurrTime)(struct syslogTime *t, time_t *ttSeconds); - rsRetVal (*ParseTIMESTAMP3339)(struct syslogTime *pTime, uchar** ppszTS); - rsRetVal (*ParseTIMESTAMP3164)(struct syslogTime *pTime, uchar** pszTS); + rsRetVal (*ParseTIMESTAMP3339)(struct syslogTime *pTime, uchar** ppszTS, int*); + rsRetVal (*ParseTIMESTAMP3164)(struct syslogTime *pTime, uchar** pszTS, int*); int (*formatTimestampToMySQL)(struct syslogTime *ts, char* pDst); int (*formatTimestampToPgSQL)(struct syslogTime *ts, char *pDst); int (*formatTimestamp3339)(struct syslogTime *ts, char* pBuf); |