X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/abe6b90f9d4cb5296d74f73169d2a622fb9932e6..6966f351a5e7e0d6b5d10165c71c366495f7f520:/src/exim_monitor/em_hdr.h

diff --git a/src/exim_monitor/em_hdr.h b/src/exim_monitor/em_hdr.h
index 02cc2fd22..ee05815df 100644
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -1,10 +1,9 @@
-/* $Cambridge: exim/src/exim_monitor/em_hdr.h,v 1.2 2004/10/07 10:48:02 ph10 Exp $ */
-
 /*************************************************
 *                 Exim Monitor                   *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) The Exim Maintainers 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -87,24 +86,26 @@ anything. */
 
 /* Regular expression include */
 
-#include "pcre/pcre.h"
-
-/* Includes from the main source of Exim. We need to have MAXPACKET defined for
-the benefit of structs.h. One of these days I should tidy up this interface so
-that this kind of kludge isn't needed. */
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include <pcre2.h>
 
-#define MAXPACKET 1024
+/* Includes from the main source of Exim.  One of these days I should tidy up
+this interface so that this kind of kludge isn't needed. */
 
-#include "mytypes.h"
-#include "macros.h"
-#include "config.h"
+#ifndef NS_MAXMSG
+# define NS_MAXMSG 65535
+#endif
+typedef void hctx;
 
 #include "local_scan.h"
+#include "macros.h"
 #include "structs.h"
+#include "blob.h"
 #include "globals.h"
+#include "hintsdb.h"
+#include "hintsdb_structs.h"
 #include "functions.h"
 #include "osfunctions.h"
-#include "store.h"
 
 /* The sys/resource.h header on SunOS 4 causes trouble with the gcc
 compiler. Just stuff the bit we want in here; pragmatic easy way out. */
@@ -275,7 +276,7 @@ extern uschar *queue_stripchart_name; /* sic */
 extern int     queue_update;        /* update interval */
 extern int     queue_width;         /* width of queue window */
 
-extern pcre   *yyyymmdd_regex;    /* for matching yyyy-mm-dd */
+extern pcre2_code   *yyyymmdd_regex;    /* for matching yyyy-mm-dd */
 
 extern uschar *size_stripchart;     /* path for size monitoring */
 extern uschar *size_stripchart_name; /* name for size stripchart */
@@ -284,7 +285,7 @@ extern int     spool_is_split;      /* True if detected split spool */
 extern int     start_small;         /* True to start with small window */
 extern int     stripchart_height;   /* height of stripcharts */
 extern int     stripchart_number;   /* number of stripcharts */
-extern pcre  **stripchart_regex;  /* vector of regexps */
+extern pcre2_code  **stripchart_regex;  /* vector of regexps */
 extern uschar **stripchart_title;    /* vector of titles */
 extern int    *stripchart_total;    /* vector of accumulating values */
 extern int     stripchart_update;   /* update interval */