Merge branch 'jh/maint-config-file-prefix' into maint

diff --git a/compat/regex/regex.c b/compat/regex/regex.c
index 5ea007567d15c229685f571628d4afcce6783e8d..67d5c370a04c0630089e8601eafde5c05957959c 100644 (file)
--- a/compat/regex/regex.c
+++ b/compat/regex/regex.c
@@ -4852,11 +4852,8 @@ regexec (preg, string, nmatch, pmatch, eflags)
    from either regcomp or regexec.   We don't use PREG here.  */
 
 size_t
-regerror (errcode, preg, errbuf, errbuf_size)
-    int errcode;
-    const regex_t *preg;
-    char *errbuf;
-    size_t errbuf_size;
+regerror(int errcode, const regex_t *preg,
+        char *errbuf, size_t errbuf_size)
 {
   const char *msg;
   size_t msg_size;