Update.

	Define struct group_req and struct group_source_req.

diff --git a/ChangeLog b/ChangeLog
index c4c63ec7677a609db9190fd5654849c37f4a9ab3..4bf6b7ca1b216644ae5ba8b952a260725d54a7cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * inet/netinet/in.h: Define struct ip_mreq and struct
        ip_mreq_source.
+       Define struct group_req and struct group_source_req.
        * sysdeps/unix/sysv/linux/bits/in.h: Define IP_UNBLOCK_SOURCE,
        IP_BLOCK_SOURCE, IP_ADD_SOURCE_MEMBERSHIP,
        IP_DROP_SOURCE_MEMBERSHIP, IP_MSFILTER, MCAST_JOIN_GROUP,

diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index 7ec6741eb1c246c8689e7a389b8468d356aee325..6aee8425309e73e64aa438bb7caa09f239c9b19e 100644 (file)
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -273,6 +273,29 @@ struct ipv6_mreq
   };
 
 
+/* Multicast group request.  */
+struct group_req
+  {
+    /* Interface index.  */
+    uint32_t gr_interface;
+
+    /* Group address.  */
+    struct sockaddr_storage gr_group;
+  };
+
+struct group_source_req
+  {
+    /* Interface index.  */
+    uint32_t gsr_interface;
+
+    /* Group address.  */
+    struct sockaddr_storage gsr_group;
+
+    /* Source address.  */
+    struct sockaddr_storage gsr_source;
+  };
+
+
 /* Get system-specific definitions.  */
 #include <bits/in.h>
 

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 282abc1256e53aa1ad0ab8dc38252d16d14c1187..7ce3d1085899d189d63783dcfd8403968ae4825d 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-17  Petter Reinholdtsen  <pere@hungry.com>
+
+       * charmaps/IBM874: Add new alias WINDOWS-874 for IBM874 [BZ #244].
+
 2004-05-18  Petter Reinholdtsen  <pere@hungry.com>
 
        * locales/sl_SI [LC_TIME]: Correct d_fmt date format from

diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index 5842c7c8734f0c28988e2c2e5e3d5e088960f119..d92619630aa0526daafb6be06817bf2ffe6749b6 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -43,12 +43,12 @@
 #define IP_ADD_SOURCE_MEMBERSHIP 39 /* ip_mreq_source: join source group */
 #define IP_DROP_SOURCE_MEMBERSHIP 40 /* ip_mreq_source: leave source group */
 #define IP_MSFILTER 41
-#define MCAST_JOIN_GROUP 42
-#define MCAST_BLOCK_SOURCE 43
-#define MCAST_UNBLOCK_SOURCE 44
-#define MCAST_LEAVE_GROUP 45
-#define MCAST_JOIN_SOURCE_GROUP 46
-#define MCAST_LEAVE_SOURCE_GROUP 47
+#define MCAST_JOIN_GROUP 42    /* group_req: join any-source group */
+#define MCAST_BLOCK_SOURCE 43  /* group_source_req: block from given group */
+#define MCAST_UNBLOCK_SOURCE 44        /* group_source_req: unblock from given group*/
+#define MCAST_LEAVE_GROUP 45   /* group_req: leave any-source group */
+#define MCAST_JOIN_SOURCE_GROUP 46 /* group_source_req: join source-spec gr */
+#define MCAST_LEAVE_SOURCE_GROUP 47 /* group_source_req: leave source-spec gr*/
 #define MCAST_MSFILTER 48
 
 #define MCAST_EXCLUDE   0