From bbd00a621a86d4c294074530fefb69af9c978b52 Mon Sep 17 00:00:00 2001
From: Marko Kreen <markokr@gmail.com>
Date: Wed, 9 Sep 2009 21:44:00 +0300
Subject: [PATCH] Fix strerror_r on win32

---
 usual/logging.c | 2 +-
 usual/safeio.c  | 1 +
 usual/string.h  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/usual/logging.c b/usual/logging.c
index 1983f26..7ab102d 100644
--- 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 18e7a0e..32c4649 100644
--- 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 356679b..6488523 100644
--- 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);
-- 
2.39.5