Sync from gnulib.

diff --git a/lib/error.c b/lib/error.c
index 94e32fd82294069edbaba4a70b623f6d19fb7e31..9bb3e558cb8bc197bced81d4b8278e21c047b8cf 100644 (file)
--- 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 39d2bb4e5b9ba8e9c4dcfdea525ffd2d67fca213..999e25ef3b9705e1ebebc9d29eeae8c43597fb14 100644 (file)
--- 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 45db40e9fa46e93374bb1a6727c8c29a25e9a446..d3840704a02a09d68f6f3748ac9059c5f84dac24 100644 (file)
--- 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;
     }