>From 6cc9ad5fd79c9efb43b25a0f5a0a3fccc2121b91 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 16 Aug 2020 13:00:43 +0200
Subject: [PATCH 06/13] Fix "warning: 'snprintf' macro redefined".

* lib/strerror_r.c (snprintf): Undefine before redefining.
---
 ChangeLog        | 3 +++
 lib/strerror_r.c | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a7a22d8..eca93a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2020-08-16  Bruno Haible  <bruno@clisp.org>
 
+	Fix "warning: 'snprintf' macro redefined".
+	* lib/strerror_r.c (snprintf): Undefine before redefining.
+
 	Fix "warning: address of array 'locale' will always evaluate to 'true'".
 	* lib/nl_langinfo.c (ctype_codeset): Remove redundant NULL test.
 
diff --git a/lib/strerror_r.c b/lib/strerror_r.c
index 9ccc6c3..3044599 100644
--- a/lib/strerror_r.c
+++ b/lib/strerror_r.c
@@ -120,6 +120,7 @@ local_snprintf (char *buf, size_t buflen, const char *format, ...)
     buf[buflen - 1] = '\0';
   return result;
 }
+# undef snprintf
 # define snprintf local_snprintf
 #endif
 
-- 
2.7.4