Fix handling of server which follows a RCPT 452 with a 250. Bug 26092

[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 c89b6db5506d898f4f7e1ce74a1cec882e607828..c45f9fca70b51587a1452f2f9a825859a670412f 100644 (file)
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -1,9 +1,8 @@
-/* $Cambridge: exim/src/exim_monitor/em_hdr.h,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */; iline//

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

-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* 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. */
 
 


@@ -86,24 +85,24 @@ 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
-that this kind of kludge isn't needed. */
+/* 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. */

 
 

-#define MAXPACKET 1024
-
-#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 "local_scan.h"

+#include "macros.h"

 #include "structs.h"
 #include "structs.h"

+#include "blob.h"

 #include "globals.h"
 #include "globals.h"

+#include "dbstuff.h"

 #include "functions.h"
 #include "osfunctions.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. */
 
 /* 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. */