X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fac%2Ferrno.h;h=e1b7168cacaa2352f68ed106d0aac918226ea47d;hb=db9130b6a723bfd56da90e929c2397379ee21741;hp=a7b10eb5d8a2aa6fc8fd785e44b48d36093c6e3b;hpb=9a58202116350f7a52a27e78491b07045ebeacc6;p=openldap

diff --git a/include/ac/errno.h b/include/ac/errno.h
index a7b10eb5d8..e1b7168cac 100644
--- a/include/ac/errno.h
+++ b/include/ac/errno.h
@@ -1,12 +1,17 @@
 /* Generic errno.h */
-/*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_ERRNO_H
@@ -22,17 +27,29 @@
 	/* no sys_errlist */
 #	define		sys_nerr	0
 #	define		sys_errlist	((char **)0)
-#elif DECL_SYS_ERRLIST 
+#elif DECL_SYS_ERRLIST
 	/* have sys_errlist but need declaration */
-	extern int      sys_nerr;
-	extern char     *sys_errlist[];
+	LDAP_LIBC_V(int)      sys_nerr;
+	LDAP_LIBC_V(char)    *sys_errlist[];
 #endif
 
-#ifndef HAVE_STRERROR
-#define	strerror(err) \
-	(err) > -1 && (err) < sys_nerr ? sys_errlist[(err)] : "unknown"
+#undef _AC_ERRNO_UNKNOWN
+#define _AC_ERRNO_UNKNOWN "unknown error"
+
+#ifdef HAVE_SYS_ERRLIST
+	/* this is thread safe */
+#	define	STRERROR(e) ( (e) > -1 && (e) < sys_nerr \
+			? sys_errlist[(e)] : _AC_ERRNO_UNKNOWN )
+
+#elif defined( HAVE_STRERROR )
+	/* this may not be thread safe */
+	/* and, yes, some implementations of strerror may return NULL */
+#	define	STRERROR(e) ( strerror(e) \
+		? strerror(e) : _AC_ERRNO_UNKNOWN )
+
+#else
+	/* this is thread safe */
+#	define	STRERROR(e) ( _AC_ERRNO_UNKNOWN )
 #endif
 
-extern char* strerror_r();
-    
 #endif /* _AC_ERRNO_H */