From 90a65c17c1754d1890af4f00374d7af435d8cc7e Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Wed, 1 Jun 2011 08:14:34 -0600
Subject: [PATCH] strerror_r: fix includes for FreeBSD

* lib/strerror_r.c (includes): Use <stdlib.h> unconditionally,
since we use abort on some platforms.
Reported by Matthias Bolte.

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 ChangeLog        | 7 +++++++
 lib/strerror_r.c | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8fc9faa95..f62e43b6e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-01  Eric Blake  <eblake@redhat.com>
+
+	strerror_r: fix includes for FreeBSD
+	* lib/strerror_r.c (includes): Use <stdlib.h> unconditionally,
+	since we use abort on some platforms.
+	Reported by Matthias Bolte.
+
 2011-05-31  Bruno Haible  <bruno@clisp.org>
 
 	Fix link errors in tests: openat-die uses gettext-h.
diff --git a/lib/strerror_r.c b/lib/strerror_r.c
index 494b1f04b5..f9242e366a 100644
--- a/lib/strerror_r.c
+++ b/lib/strerror_r.c
@@ -27,6 +27,7 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #if GNULIB_defined_ESOCK /* native Windows platforms */
 # if HAVE_WINSOCK2_H
@@ -82,9 +83,6 @@ extern char *sys_errlist[];
 extern int sys_nerr;
 #  endif
 
-/* Get sys_nerr, sys_errlist on native Windows.  */
-#  include <stdlib.h>
-
 # else
 
 #  include "glthread/lock.h"
-- 
2.30.2