[continued from previous message]

/******************************************************************************
! * The Elm (ME+) Mail System - $Revision: 2.10 $ $State: Exp $
*
* Author: Kari Hurtta <hurtta+elm@siilo.FMI.FI> (was hurtta+elm@posti.FMI.FI)
* or Kari Hurtta <elm@elmme-mailer.org>
***************
*** 91,97 ****
if (error && show_hdr_error_OFF == show_header_errors)
return;

! Va_start(vl, msg); /* defined in defs.h */

S = elm_smessage(0,format,msg,vl);

--- 91,97 ----
if (error && show_hdr_error_OFF == show_header_errors)
return;

! Va_start(vl, msg); /* defined in hdrs/elm_defs.h */

S = elm_smessage(0,format,msg,vl);

***************
*** 115,121 ****
else if (HEADER_ERROR_magic != (*error)->magic)
panic("HEADERS PANIC",__FILE__,__LINE__,"process_header_error",
"bad magic number",0);
-

(*error)->errors =
safe_array_realloc((*error)->errors,
--- 115,120 ----
Index: elmME+.2.5.alpha52-cvs/lib/addr/getaddr.c
*** elmME+.2.5.alpha51/lib/addr/getaddr.c Sat May 21 10:02:23 2016
--- elmME+.2.5.alpha52-cvs/lib/addr/getaddr.c Fri May 22 17:56:37 2020 ***************
*** 1,7 ****
! static char rcsid[] = "@(#)$Id: getaddr.c,v 2.13 2016/04/30 17:02:27 hurtta Exp $";

/******************************************************************************
! * The Elm (ME+) Mail System - $Revision: 2.13 $ $State: Exp $
*
* Author: Kari Hurtta <hurtta+elm@siilo.FMI.FI> (was h