Macros: convert to tree for speed of lookup

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

diff --git a/src/src/globals.h b/src/src/globals.h
index bea027e6210c03adbb6115bc40f816d553af82db..d412e34a0bb21ee9eee58c7b4c01010ed36b5c31 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -565,8 +565,7 @@ extern uschar *lookup_dnssec_authenticated; /* AD status of dns lookup */
 extern int     lookup_open_max;        /* Max lookup files to cache */
 extern uschar *lookup_value;           /* Value looked up from file */
 
-extern macro_item *macros;             /* Configuration macros */
-extern macro_item *mlast;              /* Last item in macro list */
+extern unsigned m_number;             /* count of macros */
 extern uschar *mailstore_basename;     /* For mailstore deliveries */
 #ifdef WITH_CONTENT_SCAN
 extern uschar *malware_name;           /* Name of virus or malware ("W32/Klez-H") */
@@ -955,6 +954,7 @@ extern int     transport_write_timeout;/* Set to time out individual writes */
 extern tree_node *tree_dns_fails;      /* Tree of DNS lookup failures */
 extern tree_node *tree_duplicates;     /* Tree of duplicate addresses */
 extern tree_node *tree_nonrecipients;  /* Tree of nonrecipient addresses */
+extern tree_node *tree_macros;         /* Configuration macros */
 extern tree_node *tree_unusable;       /* Tree of unusable addresses */
 
 extern BOOL    trusted_caller;         /* Caller is trusted */