Merge branch dane-tpda into dane

[users/jgh/exim.git] / src / exim_monitor / em_hdr.h

diff --git a/src/exim_monitor/em_hdr.h b/src/exim_monitor/em_hdr.h
index f714a87de423cbbf78e3ccf987dee24eb62f8482..ed95716a3113ba08c328351f82b3a2163f951443 100644 (file)
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/exim_monitor/em_hdr.h,v 1.4 2005/01/04 10:00:42 ph10 Exp $ */
-

 /*************************************************
 *                 Exim Monitor                   *
 *************************************************/
 
 /*************************************************
 *                 Exim Monitor                   *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2005 */
+/* Copyright (c) University of Cambridge 1995 - 2009 */

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


@@ -87,7 +85,7 @@ anything. */
 
 /* Regular expression include */
 
 
 /* Regular expression include */
 

-#include "pcre/pcre.h"
+#include <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
 
 /* 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


@@ -102,6 +100,7 @@ that this kind of kludge isn't needed. */
 #include "local_scan.h"
 #include "structs.h"
 #include "globals.h"
 #include "local_scan.h"
 #include "structs.h"
 #include "globals.h"

+#include "dbstuff.h"

 #include "functions.h"
 #include "osfunctions.h"
 #include "store.h"
 #include "functions.h"
 #include "osfunctions.h"
 #include "store.h"