X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fregex.c;h=d3840704a02a09d68f6f3748ac9059c5f84dac24;hb=931c1209da16cb5488643b8c84c5263563320334;hp=32c15191158f444a71e62b2970528cb853e5c3b1;hpb=5e576318cdb5628381e4082c3f4a29c1e97f27a8;p=gnulib.git

diff --git a/lib/regex.c b/lib/regex.c
index 32c151911..d3840704a 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -583,7 +583,10 @@ typedef enum
 #  undef INSIDE_RECURSION
 # endif
 #endif
-#include "unlocked-io.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 #ifdef INSIDE_RECURSION
 /* Common operations on the compiled pattern.  */
@@ -7906,7 +7909,7 @@ re_comp (const char *s)
   if (!s)
     {
       if (!re_comp_buf.buffer)
-	return gettext ("No previous regular expression");
+	return (char *) gettext ("No previous regular expression");
       return 0;
     }