update from main archive 961116

diff --git a/sysdeps/unix/sysv/linux/netinet/in.h b/sysdeps/unix/sysv/linux/netinet/in.h
index 0d0e031..86d1274 100644 (file)
--- a/sysdeps/unix/sysv/linux/netinet/in.h
+++ b/sysdeps/unix/sysv/linux/netinet/in.h
@@ -24,7 +24,10 @@
 #include <sys/socket.h>
 #include <linux/in.h>
 
 #include <sys/socket.h>
 #include <linux/in.h>
 

-/* Standard well-known ports.  */
+/* Standard well-known ports.  The use of these constants is
+   deprecated.  Instead use the contents of the file `/etc/services'
+   or similar databases by using the function getservbyname and
+   getservbyport.  */

 enum
   {
     IPPORT_ECHO = 7,           /* Echo service.  */
 enum
   {
     IPPORT_ECHO = 7,           /* Echo service.  */


@@ -86,13 +89,13 @@ __BEGIN_DECLS
 
 /* Functions to convert between host and network byte order.  */
 
 
 /* Functions to convert between host and network byte order.  */
 

-extern unsigned long int ntohl __P ((unsigned long int));
-extern unsigned short int ntohs __P ((unsigned short int));
-extern unsigned long int htonl __P ((unsigned long int));
-extern unsigned short int htons __P ((unsigned short int));
+extern unsigned long int ntohl __P ((unsigned long int __long_word));
+extern unsigned short int ntohs __P ((unsigned short int __short_word));
+extern unsigned long int htonl __P ((unsigned long int __long_word));
+extern unsigned short int htons __P ((unsigned short int __short_word));

 
 /* Bind socket FD to a privileged IP address SIN.  */
 
 /* Bind socket FD to a privileged IP address SIN.  */

-extern int bindresvport __P ((int __fd, struct sockaddr_in * __sin));
+extern int bindresvport __P ((int __fd, struct sockaddr_in * __sock_in));

 
 __END_DECLS
 
 
 __END_DECLS
 


@@ -101,14 +104,14 @@ __END_DECLS
 #if __BYTE_ORDER == __BIG_ENDIAN
 /* The host byte order is the same as network byte order,
    so these functions are all just identity.  */
 #if __BYTE_ORDER == __BIG_ENDIAN
 /* The host byte order is the same as network byte order,
    so these functions are all just identity.  */

-#undef ntohl
-#define        ntohl(x)        (x)
-#undef ntohs
-#define        ntohs(x)        (x)
-#undef htonl
-#define        htonl(x)        (x)
-#undef htons
-#define        htons(x)        (x)
+# undef ntohl
+# define ntohl(x)      (x)
+# undef ntohs
+# define ntohs(x)      (x)
+# undef htonl
+# define htonl(x)      (x)
+# undef htons
+# define htons(x)      (x)

 #endif
 
 #endif /* netinet/in.h */
 #endif
 
 #endif /* netinet/in.h */

diff --git a/time/Makefile b/time/Makefile
index e29a50b..772461c 100644 (file)
--- a/time/Makefile
+++ b/time/Makefile
@@ -125,7 +125,7 @@ $(installed-localtime-file): $(zonedir)/$(localtime) $(objpfx)zic
          echo Site timezone NOT reset to Factory.; \
        else \
          rm -f $@T; \
          echo Site timezone NOT reset to Factory.; \
        else \
          rm -f $@T; \

-         $(SHELL) $(common-objpfx)$(..)rellns-sh $< $@T; \
+         $(SHELL) $(top_absdir)/rellns-sh $< $@T; \

          mv -f $@T $@; \
        fi
 endif
          mv -f $@T $@; \
        fi
 endif