[commits] r14705 - in /fsf/trunk/ports: ChangeLog.mips sysdeps/unix/sysv/linux/mips/bits/socket.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Jul 26 00:02:38 2011
New Revision: 14705

Log:
Import glibc-ports-mainline for 2011-07-26

Modified:
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Tue Jul 26 00:02:38 2011
@@ -1,3 +1,8 @@
+2011-07-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/bits/socket.h (PF_NFC, AF_NFC):
+	Define.
+
 2011-06-20  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c,

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/bits/socket.h Tue Jul 26 00:02:38 2011
@@ -111,7 +111,8 @@
 #define PF_IEEE802154	36	/* IEEE 802.15.4 sockets.  */
 #define PF_CAIF		37	/* CAIF sockets.  */
 #define PF_ALG		38	/* Algorithm sockets.  */
-#define	PF_MAX		39	/* For now..  */
+#define PF_NFC		39	/* NFC sockets.  */
+#define	PF_MAX		40	/* For now..  */
 
 /* Address families.  */
 #define	AF_UNSPEC	PF_UNSPEC
@@ -154,6 +155,7 @@
 #define AF_IEEE802154	PF_IEEE802154
 #define AF_CAIF		PF_CAIF
 #define AF_ALG		PF_ALG
+#define AF_NFC		PF_NFC
 #define	AF_MAX		PF_MAX
 
 /* Socket level values.  Others are defined in the appropriate headers.