Fix the way ${extract is skipped in the untaken branch of a conditional.

[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 02cc2fd2254cd1ea979b731e002d15a7796802d9..c0621d9dee943775fc84fe27db6f23160263521b 100644 (file)
--- a/src/exim_monitor/em_hdr.h
+++ b/src/exim_monitor/em_hdr.h
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/exim_monitor/em_hdr.h,v 1.2 2004/10/07 10:48:02 ph10 Exp $ */
+/* $Cambridge: exim/src/exim_monitor/em_hdr.h,v 1.7 2008/01/16 13:44:45 nm4 Exp $ */
 
 /*************************************************
 *                 Exim Monitor                   *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* Copyright (c) University of Cambridge 1995 - 2007 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -87,7 +87,7 @@ anything. */
 
 /* 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
@@ -95,9 +95,9 @@ that this kind of kludge isn't needed. */
 
 #define MAXPACKET 1024
 
+#include "config.h"
 #include "mytypes.h"
 #include "macros.h"
-#include "config.h"
 
 #include "local_scan.h"
 #include "structs.h"