GnuTLS: fix build with older library versions

[exim.git] / src / exim_monitor / em_globals.c

diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index 30d22b5ebca2bb34b7483dbb640ec2e660a69fd0..3d452c6ec177436fa30a372ac03315dba82aa9ce 100644 (file)
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */

+/* Copyright (c) The Exim Maintainers 2021 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -81,7 +82,7 @@ uschar *queue_stripchart_name = NULL;
 int     queue_update = 60;
 int     queue_width = 600;
 
 int     queue_update = 60;
 int     queue_width = 600;
 

-pcre   *yyyymmdd_regex;
+pcre2_code   *yyyymmdd_regex;

 
 uschar *size_stripchart = NULL;
 uschar *size_stripchart_name = NULL;
 
 uschar *size_stripchart = NULL;
 uschar *size_stripchart_name = NULL;


@@ -89,7 +90,7 @@ int     spool_is_split = FALSE;
 int     start_small = FALSE;
 int     stripchart_height = 90;
 int     stripchart_number = 1;
 int     start_small = FALSE;
 int     stripchart_height = 90;
 int     stripchart_number = 1;

-pcre  **stripchart_regex;
+pcre2_code  **stripchart_regex;

 uschar **stripchart_title;
 int    *stripchart_total;
 int     stripchart_update = 60;
 uschar **stripchart_title;
 int    *stripchart_total;
 int     stripchart_update = 60;


@@ -196,6 +197,7 @@ uschar *queue_name             = US"";
 int     received_count         = 0;
 uschar *received_protocol      = NULL;
 struct timeval received_time   = { 0, 0 };
 int     received_count         = 0;
 uschar *received_protocol      = NULL;
 struct timeval received_time   = { 0, 0 };

+struct timeval received_time_complete = { 0, 0 };

 int     recipients_count       = 0;
 recipient_item *recipients_list = NULL;
 int     recipients_list_max    = 0;
 int     recipients_count       = 0;
 recipient_item *recipients_list = NULL;
 int     recipients_list_max    = 0;