Merge branch 'v5-beta' into v5-devel

Conflicts:
	ChangeLog
	configure.ac
	doc/imfile.html
	plugins/imfile/imfile.c
	runtime/rsyslog.h

1 files changed, 1 insertions, 1 deletions

diff --git a/action.c b/action.c
index f3e26b13..0d298673 100644
--- a/action.c
+++ b/action.c
@@ -1388,7 +1388,7 @@ doSubmitToActionQNotAllMarkBatch(action_t *pAction, batch_t *pBatch)
 					} else {
 						bProcessMarkMsgs = 1;
 					}
-				} while(ATOMIC_CAS(&pAction->f_time, lastAct,
+				} while(ATOMIC_CAS_time_t(&pAction->f_time, lastAct,
 					((msg_t*)(pBatch->pElem[i].pUsrp))->ttGenTime, &pAction->mutCAS) == 0);
 			}
 			if(bProcessMarkMsgs) {