Update.

	* inet/netinet/in.h: Make IPPROTO_ constants also macros.

diff --git a/ChangeLog b/ChangeLog
index 2a068da..9214050 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-01-26  Ulrich Drepper  <drepper@redhat.com>
 
+       * inet/netinet/in.h: Make IPPROTO_ constants also macros.
+
        * conform/conformtest.pl: Implement optional-type.
 
        * resolv/netdb.h: Include <netinet/in.h> not <sys/socket.h>.  Include

diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index 4bceaef..3ffa5e2 100644 (file)
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -33,31 +33,57 @@ __BEGIN_DECLS
 enum
   {
     IPPROTO_IP = 0,       /* Dummy protocol for TCP.  */
+#define IPPROTO_IP             IPPROTO_IP
     IPPROTO_HOPOPTS = 0,   /* IPv6 Hop-by-Hop options.  */
+#define IPPROTO_HOPOPTS                IPPROTO_HOPOPTS
     IPPROTO_ICMP = 1,     /* Internet Control Message Protocol.  */
+#define IPPROTO_ICMP           IPPROTO_ICMP
     IPPROTO_IGMP = 2,     /* Internet Group Management Protocol. */
+#define IPPROTO_IGMP           IPPROTO_IGMP
     IPPROTO_IPIP = 4,     /* IPIP tunnels (older KA9Q tunnels use 94).  */
+#define IPPROTO_IPIP           IPPROTO_IPIP
     IPPROTO_TCP = 6,      /* Transmission Control Protocol.  */
+#define IPPROTO_TCP            IPPROTO_TCP
     IPPROTO_EGP = 8,      /* Exterior Gateway Protocol.  */
+#define IPPROTO_EGP            IPPROTO_EGP
     IPPROTO_PUP = 12,     /* PUP protocol.  */
+#define IPPROTO_PUP            IPPROTO_PUP
     IPPROTO_UDP = 17,     /* User Datagram Protocol.  */
+#define IPPROTO_UDP            IPPROTO_UDP
     IPPROTO_IDP = 22,     /* XNS IDP protocol.  */
+#define IPPROTO_IDP            IPPROTO_IDP
     IPPROTO_TP = 29,      /* SO Transport Protocol Class 4.  */
+#define IPPROTO_TP             IPPROTO_TP
     IPPROTO_IPV6 = 41,     /* IPv6 header.  */
+#define IPPROTO_IPV6           IPPROTO_IPV6
     IPPROTO_ROUTING = 43,  /* IPv6 routing header.  */
+#define IPPROTO_ROUTING                IPPROTO_ROUTING
     IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header.  */
+#define IPPROTO_FRAGMENT       IPPROTO_FRAGMENT
     IPPROTO_RSVP = 46,    /* Reservation Protocol.  */
+#define IPPROTO_RSVP           IPPROTO_RSVP
     IPPROTO_GRE = 47,     /* General Routing Encapsulation.  */
+#define IPPROTO_GRE            IPPROTO_GRE
     IPPROTO_ESP = 50,      /* encapsulating security payload.  */
+#define IPPROTO_ESP            IPPROTO_ESP
     IPPROTO_AH = 51,       /* authentication header.  */
+#define IPPROTO_AH             IPPROTO_AH
     IPPROTO_ICMPV6 = 58,   /* ICMPv6.  */
+#define IPPROTO_ICMPV6         IPPROTO_ICMPV6
     IPPROTO_NONE = 59,     /* IPv6 no next header.  */
+#define IPPROTO_NONE           IPPROTO_NONE
     IPPROTO_DSTOPTS = 60,  /* IPv6 destination options.  */
+#define IPPROTO_DSTOPTS                IPPROTO_DSTOPTS
     IPPROTO_MTP = 92,     /* Multicast Transport Protocol.  */
+#define IPPROTO_MTP            IPPROTO_MTP
     IPPROTO_ENCAP = 98,           /* Encapsulation Header.  */
+#define IPPROTO_ENCAP          IPPROTO_ENCAP
     IPPROTO_PIM = 103,    /* Protocol Independent Multicast.  */
+#define IPPROTO_PIM            IPPROTO_PIM
     IPPROTO_COMP = 108,           /* Compression Header Protocol.  */
+#define IPPROTO_COMP           IPPROTO_COMP
     IPPROTO_RAW = 255,    /* Raw IP packets.  */
+#define IPPROTO_RAW            IPPROTO_RAW
     IPPROTO_MAX
   };