Fix strerror_r on win32

diff --git a/usual/logging.c b/usual/logging.c
index 1983f2622398249b6956d3cd071fc870c2634199..7ab102db9ce94eed788b16c235a5134fa94ac603 100644 (file)
--- a/usual/logging.c
+++ b/usual/logging.c
@@ -20,8 +20,8 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <string.h>
 
+#include <usual/string.h>
 #include <usual/time.h>
 
 #ifdef HAVE_SYSLOG_H

diff --git a/usual/safeio.c b/usual/safeio.c
index 18e7a0eacadf5286974203888b4c92e146134c35..32c4649b97210ecd73bc404e9db484668a998eb1 100644 (file)
--- a/usual/safeio.c
+++ b/usual/safeio.c
@@ -25,6 +25,7 @@
 
 #include <usual/socket.h>
 #include <usual/logging.h>
+#include <usual/string.h>
 
 int safe_read(int fd, void *buf, int len)
 {

diff --git a/usual/string.h b/usual/string.h
index 356679bcce2b67be756a79aca944f552e6bfd77c..6488523d6902112c4c3a03efd25141866ed148da 100644 (file)
--- a/usual/string.h
+++ b/usual/string.h
@@ -90,7 +90,7 @@ const char *basename(const char *path);
 const char *win32_strerror(int e);
 #define strerror(x) win32_strerror(x)
 const char *win32_strerror_r(int e, char *dst, size_t dstlen);
-#define strerror_r(x) win32_strerror_r(x)
+#define strerror_r(a,b,c) win32_strerror_r(a,b,c)
 #else
 /* otherwise convert native strerror_r() to GNU signature */
 const char *wrap_strerror_r(int e, char *dst, size_t dstlen);