Move Proxy-Protocol impl to separate srcfile

[exim.git] / src / src / globals.h

diff --git a/src/src/globals.h b/src/src/globals.h
index f2e1476708034664107541f80ed97434cfe7783e..e216b92087b4f9b3ab4969508750ad0bb9f7a21a 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -257,8 +257,6 @@ extern struct global_flags {
 
  BOOL   queue_2stage                   :1; /* Run queue in 2-stage manner */
  BOOL   queue_only_policy              :1; /* ACL or local_scan wants queue_only */
- BOOL   queue_run_first_delivery       :1; /* If TRUE, first deliveries only */
- BOOL   queue_run_force                        :1; /* TRUE to force during queue run */
  BOOL   queue_run_local                        :1; /* Local deliveries only in queue run */
  BOOL   queue_running                  :1; /* TRUE for queue running process and */
  BOOL   queue_smtp                     :1; /* Disable all immediate SMTP (-odqs)*/
@@ -823,7 +821,7 @@ extern uschar *process_log_path;       /* Alternate path */
 extern const uschar *process_purpose;  /* for debug output */
 extern BOOL    prod_requires_admin;    /* TRUE if prodding requires admin */
 
-#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
+#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS) || defined(EXPERIMENTAL_XCLIENT)
 extern uschar *hosts_proxy;            /* Hostlist which (require) use proxy protocol */
 extern uschar *proxy_external_address; /* IP of remote interface of proxy */
 extern int     proxy_external_port;    /* Port on remote interface of proxy */
@@ -837,6 +835,8 @@ extern uschar *prvscheck_address;      /* Set during prvscheck expansion item */
 extern uschar *prvscheck_keynum;       /* Set during prvscheck expansion item */
 extern uschar *prvscheck_result;       /* Set during prvscheck expansion item */
 
+extern qrunner *qrunners;             /* tracking data for queues */
+
 extern const uschar *qualify_domain_recipient; /* Domain to qualify recipients with */
 extern uschar *qualify_domain_sender;  /* Domain to qualify senders with */
 extern uschar *queue_domains;          /* Queue these domains */
@@ -1114,8 +1114,8 @@ extern uschar *uucp_from_pattern;      /* For recognizing "From " lines */
 extern uschar *uucp_from_sender;       /* For building the sender */
 
 extern uschar *warn_message_file;      /* Template for warning messages */
-extern uschar *warnmsg_delay;          /* String form of delay time */
-extern uschar *warnmsg_recipients;     /* Recipients of warning message */
+extern const uschar *warnmsg_delay;    /* String form of delay time */
+extern const uschar *warnmsg_recipients; /* Recipients of warning message */
 extern BOOL    write_rejectlog;        /* Control of reject logging */
 
 extern uschar *verify_mode;           /* Running a router in verify mode */