From 033badd4fa8b32d9592aeef68c3f3ee7be27d19e Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Wed, 31 Jul 1996 09:45:04 +0000
Subject: [PATCH] Mon Jul 29 20:33:42 1996  Andreas Schwab 
 <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/netinet/in.h (ntohl, ntohs, htonl,
	htons) [__BIG_ENDIAN]: #undef them before defining to avoid
	redefinition warning.

Mon Jul 29 20:28:27 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* time/time.h: Don't optimize tzset() to __tzset() which bypasses
	the __tzset_lock.

Tue Jul 30 15:14:50 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* sunrpc/rpc/pmap_clnt.h: Fix botched patch for multiple inclusion
	protection.

Tue Jul 30 02:48:28 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/loadlocale.c (_nl_load_locale): Change cast to `size_t'
	to be 64-bit clean.
	Reported by Richard Henderson <rth@tamu.edu>.

Tue Jul 30 15:04:50 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* locale/programs/ld-collate.c (collate_output): Fix typo reported by
	David Miller.

Tue Jul 30 13:23:13 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/setlocale.c (setlocale): Don't try to free C locale
	data.
	Reported by Matthias Urlichs.
---
 ChangeLog                            | 33 ++++++++++++++++++++++++++++
 sysdeps/unix/sysv/linux/netinet/in.h |  4 ++++
 2 files changed, 37 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 864e2df47f..95c3d890ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+Mon Jul 29 20:33:42 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* sysdeps/unix/sysv/linux/netinet/in.h (ntohl, ntohs, htonl,
+	htons) [__BIG_ENDIAN]: #undef them before defining to avoid
+	redefinition warning.
+
+Mon Jul 29 20:28:27 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* time/time.h: Don't optimize tzset() to __tzset() which bypasses
+	the __tzset_lock.
+
+Tue Jul 30 15:14:50 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* sunrpc/rpc/pmap_clnt.h: Fix botched patch for multiple inclusion
+	protection.
+
+Tue Jul 30 02:48:28 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locale/loadlocale.c (_nl_load_locale): Change cast to `size_t'
+	to be 64-bit clean.
+	Reported by Richard Henderson <rth@tamu.edu>.
+
+Tue Jul 30 15:04:50 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* locale/programs/ld-collate.c (collate_output): Fix typo reported by
+	David Miller.
+
+Tue Jul 30 13:23:13 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* locale/setlocale.c (setlocale): Don't try to free C locale
+	data.
+	Reported by Matthias Urlichs.
+
 Tue Jul 30 14:35:17 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* sysdeps/mach/hurd/dl-sysdep.c	(__open): Use open_file.
diff --git a/sysdeps/unix/sysv/linux/netinet/in.h b/sysdeps/unix/sysv/linux/netinet/in.h
index a0b8714fd6..9ba2bdd5cb 100644
--- a/sysdeps/unix/sysv/linux/netinet/in.h
+++ b/sysdeps/unix/sysv/linux/netinet/in.h
@@ -93,9 +93,13 @@ extern unsigned short int htons __P ((unsigned short int));
 #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)
 #endif