Provide readn() as a wrapper around read()

[users/jgh/exim.git] / src / src / macro_predef.c

diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c
index 502bfc7ee8dd7f8f713b0baa97a8ed6df748acb2..6b3157fbef7223fc9857787c6027b34bd7b1e34c 100644 (file)
--- a/src/src/macro_predef.c
+++ b/src/src/macro_predef.c
@@ -25,11 +25,13 @@ builtin_macro_create(const uschar * name)
 {
 printf ("static macro_item p%d = { ", mp_index);
 if (mp_index == 0)
-  printf("NULL,");
+  printf(".next=NULL,");
 else
-  printf("&p%d,", mp_index-1);
+  printf(".next=&p%d,", mp_index-1);
 
-printf(" FALSE, %d, 1, US\"%s\", US\"y\" };\n", Ustrlen(name), CS name);
+printf(" .command_line=FALSE, .namelen=%d, .replen=1,"
+       " .name=US\"%s\", .replacement=US\"y\" };\n",
+       Ustrlen(name), CS name);
 mp_index++;
 }