update from main archive 961126

diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 6ddfd61..6350238 100644 (file)
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -97,7 +97,7 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
     {
       no_more = DB_LOOKUP_FCT (&nip, REENTRANT_NAME_STRING, (void **) &fct);
       if (no_more)
-       startp = (service_user *) -1;
+       startp = (service_user *) -1l;
       else
        {
          startp = nip;
@@ -118,7 +118,7 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
   else
     {
       fct = start_fct;
-      no_more = (nip = startp) == (service_user *) -1;
+      no_more = (nip = startp) == (service_user *) -1l;
     }
 
   while (no_more == 0)

diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index 6c8105c..1df51ab 100644 (file)
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -124,9 +124,9 @@ setup (void **fctp, const char *func_name, int all)
   if (startp == NULL)
     {
       no_more = DB_LOOKUP_FCT (&nip, func_name, fctp);
-      startp = no_more ? (service_user *) -1 : nip;
+      startp = no_more ? (service_user *) -1l : nip;
     }
-  else if (startp == (service_user *) -1)
+  else if (startp == (service_user *) -1l)
     /* No services at all.  */
     return 1;
   else

diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 8ce1e8d..af74493 100644 (file)
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -339,10 +339,10 @@ nss_lookup_function (service_user *ni, const char *fct_name)
 
              if (nss_dlerror_run (do_open) != 0)
                /* Failed to load the library.  */
-               ni->library->lib_handle = (void *) -1;
+               ni->library->lib_handle = (void *) -1l;
            }
 
-         if (ni->library->lib_handle == (void *) -1)
+         if (ni->library->lib_handle == (void *) -1l)
            /* Library not found => function not found.  */
            result = NULL;
          else

diff --git a/posix/Makefile b/posix/Makefile
index a2b7e57..fcf7cba 100644 (file)
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -25,7 +25,7 @@ headers       := sys/utsname.h sys/times.h sys/wait.h sys/types.h unistd.h          \
           glob.h regex.h wordexp.h fnmatch.h gnu/types.h getopt.h            \
           posix1_lim.h posix2_lim.h posix_opt.h local_lim.h tar.h            \
           utsnamelen.h confname.h waitflags.h waitstatus.h sys/unistd.h      \
-          sched.h schedbits.h re_comp.h
+          sched.h schedbits.h re_comp.h wait.h
 
 distribute := confstr.h
 

diff --git a/posix/sys/types.h b/posix/sys/types.h
index 26a35ee..bbda57e 100644 (file)
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -76,7 +76,6 @@ typedef unsigned short int ushort;
 typedef unsigned int uint;
 #endif
 
-#ifdef __USE_BSD
 /* These size-specific names are used by some of the inet code.  */
 
 #if !defined (__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 7
@@ -112,7 +111,6 @@ __u_intN_t (64, __DI__);
 
 typedef int register_t __attribute__ ((__mode__ (__word__)));
 
-#endif
 
 /* Some code from BIND tests this macro to see if the types above are
    defined.  */

diff --git a/posix/wait.h b/posix/wait.h
new file mode 100644 (file)
index 0000000..d01b811
--- /dev/null
+++ b/posix/wait.h
@@ -0,0 +1 @@
+#include <sys/wait.h>

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 920af79..ec7429c 100644 (file)
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -12,9 +12,9 @@
 # Library General Public License for more details.
 
 # You should have received a copy of the GNU Library General Public
-# License along with the GNU C Library; see the file COPYING.LIB.  If
-# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-# Cambridge, MA 02139, USA.
+# License along with the GNU C Library; see the file COPYING.LIB.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 #
 #      Specific makefile for stdio-common.
@@ -51,6 +51,8 @@ include ../Rules
 CFLAGS-_itoa.c = -Wno-unused
 CFLAGS-tst-printf.c = -Wno-format
 CFLAGS-tstdiomisc.c = -Wno-format
+CFLAGS-scanf4.c = -Wno-format
+CFLAGS-scanf7.c = -Wno-format
 
 ifeq ($(stdio),libio)
 ifneq (,$(filter %REENTRANT, $(defines)))