Index: grp/fgetgrent_r.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/grp/fgetgrent_r.c,v
retrieving revision 1.7
diff -u -r1.7 fgetgrent_r.c
--- fgetgrent_r.c	1998/01/30 10:58:55	1.7
+++ fgetgrent_r.c	1998/06/02 01:22:55
@@ -82,7 +82,7 @@
 		get the next line of the file to parse.  */
 	     || ! (parse_result = parse_line (p, resbuf,
 					      (void *) buffer, buflen,
-					      __errno_location ())));
+					      &errno)));
 
   if (parse_result == -1)
     {
Index: inet/getnetgrent_r.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/inet/getnetgrent_r.c,v
retrieving revision 1.11
diff -u -r1.11 getnetgrent_r.c
--- getnetgrent_r.c	1998/01/30 11:00:34	1.11
+++ getnetgrent_r.c	1998/06/02 01:23:07
@@ -135,7 +135,7 @@
   /* Free list of all netgroup names from last run.  */
   free_memory (datap);
 
-  return __internal_setnetgrent_reuse (group, datap, __errno_location ());
+  return __internal_setnetgrent_reuse (group, datap, &errno);
 }
 
 int
@@ -283,7 +283,7 @@
   __libc_lock_lock (lock);
 
   status = __internal_getnetgrent_r (hostp, userp, domainp, &dataset,
-				     buffer, buflen, __errno_location ());
+				     buffer, buflen, &errno);
 
   __libc_lock_unlock (lock);
 
Index: nss/getXXbyYY_r.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/nss/getXXbyYY_r.c,v
retrieving revision 1.17
diff -u -r1.17 getXXbyYY_r.c
--- getXXbyYY_r.c	1998/03/06 11:36:53	1.17
+++ getXXbyYY_r.c	1998/06/02 01:23:47
@@ -162,7 +162,7 @@
   while (no_more == 0)
     {
       status = (*fct) (ADD_VARIABLES, resbuf, buffer, buflen,
-		       __errno_location () H_ERRNO_VAR);
+		       &errno H_ERRNO_VAR);
 
       /* The status is NSS_STATUS_TRYAGAIN and errno is ERANGE the
 	 provided buffer is too small.  In this case we should give
Index: nss/getXXent_r.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/nss/getXXent_r.c,v
retrieving revision 1.20
diff -u -r1.20 getXXent_r.c
--- getXXent_r.c	1998/03/30 09:10:22	1.20
+++ getXXent_r.c	1998/06/02 01:23:48
@@ -245,8 +245,7 @@
     {
       int is_last_nip = nip == last_nip;
 
-      status = (*fct) (resbuf, buffer, buflen, __errno_location ()
-		       H_ERRNO_VAR);
+      status = (*fct) (resbuf, buffer, buflen, &errno H_ERRNO_VAR);
 
       /* The the status is NSS_STATUS_TRYAGAIN and errno is ERANGE the
 	 provided buffer is too small.  In this case we should give
Index: pwd/fgetpwent_r.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/pwd/fgetpwent_r.c,v
retrieving revision 1.6
diff -u -r1.6 fgetpwent_r.c
--- fgetpwent_r.c	1998/01/30 11:17:09	1.6
+++ fgetpwent_r.c	1998/06/02 01:23:53
@@ -93,8 +93,7 @@
     } while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines.  */
 	     /* Parse the line.  If it is invalid, loop to
 		get the next line of the file to parse.  */
-	     ! parse_line (p, resbuf, (void *) buffer, buflen,
-			   __errno_location ()));
+	     ! parse_line (p, resbuf, (void *) buffer, buflen, &errno));
 
   *result = resbuf;
   return 0;
Index: shadow/fgetspent_r.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/shadow/fgetspent_r.c,v
retrieving revision 1.6
diff -u -r1.6 fgetspent_r.c
--- fgetspent_r.c	1998/01/25 16:40:03	1.6
+++ fgetspent_r.c	1998/06/02 01:23:53
@@ -60,8 +60,7 @@
     } while (*p == '\0' || *p == '#' ||	/* Ignore empty and comment lines.  */
 	     /* Parse the line.  If it is invalid, loop to
 		get the next line of the file to parse.  */
-	     ! parse_line (buffer, (void *) resbuf, NULL, 0,
-			   __errno_location ()));
+	     ! parse_line (buffer, (void *) resbuf, NULL, 0, &errno));
 
   *result = resbuf;
   return 0;
Index: shadow/sgetspent_r.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/shadow/sgetspent_r.c,v
retrieving revision 1.12
diff -u -r1.12 sgetspent_r.c
--- sgetspent_r.c	1997/12/08 02:49:44	1.12
+++ sgetspent_r.c	1998/06/02 01:23:53
@@ -92,7 +92,7 @@
 	       size_t buflen, struct spwd **result)
 {
   int parse_result = parse_line (strncpy (buffer, string, buflen),
-				 resbuf, NULL, 0, __errno_location ());
+				 resbuf, NULL, 0, &errno);
   *result = parse_result > 0 ? resbuf : NULL;
 
   return *result == NULL ? errno : 0;
Index: sunrpc/publickey.c
===================================================================
RCS file: /egcs/carton/cvsfiles/libc/sunrpc/publickey.c,v
retrieving revision 1.2
diff -u -r1.2 publickey.c
--- publickey.c	1997/12/14 21:50:56	1.2
+++ publickey.c	1998/06/02 01:23:57
@@ -64,7 +64,7 @@
 
   while (! no_more)
     {
-      status = (*fct) (name, key, __errno_location ());
+      status = (*fct) (name, key, &errno);
 
       no_more = __nss_next (&nip, "getpublickey", (void **) &fct, status, 0);
     }
@@ -102,7 +102,7 @@
 
   while (! no_more)
     {
-      status = (*fct) (name, key, passwd, __errno_location ());
+      status = (*fct) (name, key, passwd, &errno);
 
       no_more = __nss_next (&nip, "getsecretkey", (void **) &fct, status, 0);
     }