From 55b663837dd12bbe5836969ac2a3f052a9028ea5 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Sun, 13 Jan 2008 05:49:32 +0000
Subject: Import cvs-1.11.22 onto vendor branch.

---
 contrib/cvs/lib/regex.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'contrib/cvs/lib/regex.c')

diff --git a/contrib/cvs/lib/regex.c b/contrib/cvs/lib/regex.c
index dd56bdb..e123284 100644
--- a/contrib/cvs/lib/regex.c
+++ b/contrib/cvs/lib/regex.c
@@ -4001,7 +4001,7 @@ static boolean alt_match_null_string_p (),
 
 /* Free everything we malloc.  */
 #ifdef MATCH_MAY_ALLOCATE
-#define FREE_VAR(var) if (var) { (void)REGEX_FREE ((void *)var); var = NULL; } else
+#define FREE_VAR(var) if (var) { REGEX_FREE (var); var = NULL; } else
 #define FREE_VARIABLES()						\
   do {									\
     REGEX_FREE_STACK (fail_stack.stack);				\
@@ -6084,7 +6084,7 @@ re_comp (s)
   if (!s)
     {
       if (!re_comp_buf.buffer)
-	return gettext ("No previous regular expression");
+	return (char *) gettext ("No previous regular expression");
       return 0;
     }
 
-- 
cgit v1.1