From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 5 Oct 2004 06:05:20 +0000 (+0000)
Subject: Sync from gnulib.
X-Git-Tag: v5.3.0~568
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ccdcbff40a62554c860446eb5f9e37bf1460f90;p=thirdparty%2Fcoreutils.git

Sync from gnulib.
---

diff --git a/lib/error.c b/lib/error.c
index 94e32fd822..9bb3e558cb 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -40,7 +40,7 @@
 # define mbsrtowcs __mbsrtowcs
 #endif
 
-#ifdef USE_UNLOCKED_IO
+#if USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #endif
 
diff --git a/lib/md5.c b/lib/md5.c
index 39d2bb4e5b..999e25ef3b 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -29,7 +29,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#ifdef USE_UNLOCKED_IO
+#if USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #endif
 
diff --git a/lib/regex.c b/lib/regex.c
index 45db40e9fa..d3840704a0 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -584,7 +584,7 @@ typedef enum
 # endif
 #endif
 
-#ifdef USE_UNLOCKED_IO
+#if USE_UNLOCKED_IO
 # include "unlocked-io.h"
 #endif
 
@@ -7909,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;
     }