From 632152e8b6cf276c72c60b3d2bda82a72a98fff4 Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Sat, 28 Dec 2019 16:24:16 -0500
Subject: [PATCH] Remember the last trigger and time trigger.

---
 src/dorem.c   | 2 +-
 src/dosubst.c | 2 +-
 src/globals.h | 4 +++-
 src/queue.c   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/dorem.c b/src/dorem.c
index 8f960d6e..423ee66f 100644
--- a/src/dorem.c
+++ b/src/dorem.c
@@ -18,9 +18,9 @@
 
 #include <stdlib.h>
 
+#include "types.h"
 #include "globals.h"
 #include "err.h"
-#include "types.h"
 #include "protos.h"
 #include "expr.h"
 
diff --git a/src/dosubst.c b/src/dosubst.c
index bfe49987..d293ca7e 100644
--- a/src/dosubst.c
+++ b/src/dosubst.c
@@ -18,9 +18,9 @@
 
 #include <stdlib.h>
 
+#include "types.h"
 #include "globals.h"
 #include "err.h"
-#include "types.h"
 #include "protos.h"
 
 #define UPPER(c) (islower(c) ? toupper(c) : (c))
diff --git a/src/globals.h b/src/globals.h
index 84a3b121..e6358e7c 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -85,8 +85,10 @@ EXTERN  FILE *ErrFp;
 EXTERN  INIT(   FILE    *PurgeFP,  NULL);
 EXTERN  INIT(   int     NumIfs,    0);
 EXTERN  INIT(   unsigned int IfFlags,   0);
-EXTERN  INIT(   int     LastTriggerDate, 0);
 EXTERN  INIT(   int     LastTrigValid, 0);
+EXTERN  Trigger  LastTrigger;
+EXTERN  TimeTrig LastTimeTrig;
+EXTERN  INIT(   int     LastTriggerDate, 0);
 EXTERN  INIT(   int     LastTriggerTime, 0);
 EXTERN  INIT(   int     ShouldCache, 0);
 EXTERN  char const   *CurLine;
diff --git a/src/queue.c b/src/queue.c
index 220f96dc..8b33c064 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -27,9 +27,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "types.h"
 #include "globals.h"
 #include "err.h"
-#include "types.h"
 #include "protos.h"
 #include "expr.h"