summaryrefslogtreecommitdiffstats
path: root/runtime/datetime.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-02 12:25:22 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-02 12:25:22 +0200
commit189c0284c11f8a9a689baf0c1f122a06a421058b (patch)
treeb152441d2878414d6a1ca3875d662906b1ac325a /runtime/datetime.h
parentb52b7a15168e43758a814b36b497f658ebb56ff3 (diff)
parentc897ac6e6de3b430911cad71e7453d8b4b3c57bc (diff)
downloadrsyslog-189c0284c11f8a9a689baf0c1f122a06a421058b.tar.gz
rsyslog-189c0284c11f8a9a689baf0c1f122a06a421058b.tar.xz
rsyslog-189c0284c11f8a9a689baf0c1f122a06a421058b.zip
Merge branch 'v4-devel' into tmp
Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tcpsrv.c
Diffstat (limited to 'runtime/datetime.h')
-rw-r--r--runtime/datetime.h4
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);