patch-2.2.11 linux/include/linux/socket.h

• Lines: 58
• Date: Mon Aug 9 12:05:13 1999
• Orig file: v2.2.10/linux/include/linux/socket.h
• Orig date: Thu Apr 15 05:42:43 1999

diff -u --recursive --new-file v2.2.10/linux/include/linux/socket.h linux/include/linux/socket.h
@@ -128,18 +128,6 @@
 	__u32	gid;
 };
 
-/* Socket types. */
-
-#define SOCK_STREAM	1		/* stream (connection) socket	*/
-#define SOCK_DGRAM	2		/* datagram (conn.less) socket	*/
-#define SOCK_RAW	3		/* raw socket			*/
-#define SOCK_RDM	4		/* reliably-delivered message	*/
-#define SOCK_SEQPACKET	5		/* sequential packet socket	*/
-#define SOCK_PACKET	10		/* linux specific way of	*/
-					/* getting packets at the dev	*/
-					/* level.  For writing rarp and	*/
-					/* other similar things on the	*/
-					/* user level.			*/
 
 /* Supported address families. */
 #define AF_UNSPEC	0
@@ -158,7 +146,7 @@
 #define AF_DECnet	12	/* Reserved for DECnet project	*/
 #define AF_NETBEUI	13	/* Reserved for 802.2LLC project*/
 #define AF_SECURITY	14	/* Security callback pseudo AF */
-#define pseudo_AF_KEY   15      /* PF_KEY key management API */
+#define AF_KEY   15      /* PF_KEY key management API */
 #define AF_NETLINK	16
 #define AF_ROUTE	AF_NETLINK /* Alias to emulate 4.4BSD */
 #define AF_PACKET	17	/* Packet family		*/
@@ -186,7 +174,7 @@
 #define PF_DECnet	AF_DECnet
 #define PF_NETBEUI	AF_NETBEUI
 #define PF_SECURITY	AF_SECURITY
-#define PF_KEY          pseudo_AF_KEY
+#define PF_KEY      AF_KEY
 #define PF_NETLINK	AF_NETLINK
 #define PF_ROUTE	AF_ROUTE
 #define PF_PACKET	AF_PACKET
@@ -273,4 +261,20 @@
 extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
 #endif
 #endif /* not kernel and not glibc */
+
+#if !defined(__KERNEL__) && (!defined(__GLIBC__) || (__GLIBC__ < 2))
+
+/* Socket types for libc5 compatibility -- KTK */
+
+#define SOCK_STREAM    1		/* stream (connection) socket	*/
+#define SOCK_DGRAM     2		/* datagram (conn.less) socket	*/
+#define SOCK_RAW       3		/* raw socket			*/
+#define SOCK_RDM       4		/* reliably-delivered message	*/
+#define SOCK_SEQPACKET 5		/* sequential packet socket	*/
+#define SOCK_PACKET    10		/* linux specific way of	*/
+					/* getting packets at the dev	*/
+					/* level.  For writing rarp and */
+					/* other similar things on the	*/
+					/* user level.			*/
+#endif /* libc<=5 && !kernel */
 #endif /* _LINUX_SOCKET_H */