(__need_error_t): New macro, before including <errno.h>. [!__const] (__const):...

diff --git a/string/argz.h b/string/argz.h
index 255e1d345de2665074838cdc06b5b5ae6718503e..e17b742cf73fac765526fb7a7cb98d0b488c131e 100644 (file)
--- a/string/argz.h
+++ b/string/argz.h
@@ -1,5 +1,5 @@
 /* Routines for dealing with '\0' separated arg vectors.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -22,9 +22,18 @@
 #define __ARGZ_H__     1
 #include <features.h>
 
-#include <errno.h>             /* Define error_t.  */
+#define __need_error_t
+#include <errno.h>
 #include <string.h>            /* Need size_t, and strchr is called below.  */
 
+#ifndef __const
+#define __const const
+#endif
+
+#ifndef __error_t_defined
+typedef int error_t;
+#endif
+
 
 __BEGIN_DECLS