libbind linux move/fix prototypes for getnetgrent(), setnetgrent(),

endnetgrent(), innetgr() and getnetgrent_r().

diff --git a/lib/bind/include/netdb.h b/lib/bind/include/netdb.h
index c24f3b94523ea4cfe09b89ec4a87ae8a9f75393e..65a5cec7a671715c9025b2976b039aa8cefe2b18 100644 (file)
--- a/lib/bind/include/netdb.h
+++ b/lib/bind/include/netdb.h
@@ -86,7 +86,7 @@
 
 /*
  *      @(#)netdb.h    8.1 (Berkeley) 6/2/93
- *     $Id: netdb.h,v 1.12.2.3 2004/03/16 00:45:49 marka Exp $
+ *     $Id: netdb.h,v 1.12.2.4 2004/03/16 02:06:55 marka Exp $
  */
 
 #ifndef _NETDB_H_
@@ -390,7 +390,14 @@ const char *gai_strerror __P((int));
 struct hostent  *getipnodebyname __P((const char *, int, int, int *));
 struct hostent *getipnodebyaddr __P((const void *, size_t, int, int *));
 void           freehostent __P((struct hostent *));
-
+#ifdef __GLIBC__
+int            getnetgrent __P((/* const */ char **, /* const */ char **,
+                                /* const */ char **));
+void           setnetgrent __P((const char *));
+void           endnetgrent __P((void));
+int            innetgr __P((const char *, const char *, const char *,
+                            const char *));
+#endif
 
 #ifdef _REENTRANT
 #if defined(__hpux) || defined(__osf__) || defined(_AIX)
@@ -517,6 +524,8 @@ struct servent      *getservent_r __P((struct servent *, char *, int));
 void           setservent_r __P((int));
 void           endservent_r __P((void));
 
+int            getnetgrent_r __P((char **, char **, char **, char *, size_t));
+
 #endif
 #endif
 __END_DECLS

diff --git a/lib/bind/include/netgroup.h b/lib/bind/include/netgroup.h
index fee6787b3f5de7d2f7a74c735add0a1d3e66a00b..72003d4346909293e481b00215ba3586b7a8c1ef 100644 (file)
--- a/lib/bind/include/netgroup.h
+++ b/lib/bind/include/netgroup.h
@@ -1,5 +1,6 @@
 #ifndef netgroup_h
 #define netgroup_h
+#ifndef __GLIBC__
 
 /*
  * The standard is crazy.  These values "belong" to getnetgrent() and
@@ -15,5 +16,5 @@ void setnetgrent __P((const char *));
 void endnetgrent __P((void));
 
 int innetgr __P((const char *, const char *, const char *, const char *));
-
+#endif
 #endif