Skip to content
Browse files

use ifdef for IGMPv3/MLDv2-related state macros to prevent a macro du…

…plication

in userland applications.  (suggested by Hitoshi Asaeda)
  • Loading branch information...
1 parent 51f04db commit 46e0d3fa4d70c3a19a35fe67d42cc36c343afcd9 suz committed Aug 29, 2006
Showing with 10 additions and 2 deletions.
  1. +7 −1 CHANGELOG
  2. +3 −1 kame/sys/netinet/icmp6.h
View
8 CHANGELOG
@@ -1,5 +1,11 @@
CHANGELOG for KAME kit
-$KAME: CHANGELOG,v 1.2829 2006/07/12 03:08:57 suz Exp $
+$KAME: CHANGELOG,v 1.2830 2006/08/29 02:00:18 suz Exp $
+
+<200608>
+2006-08-29 SUZUKI, Shinsuke <suz@alaxala.net>
+ * kame/sys/netinet/icmp6.h: use ifdef for IGMPv3/MLDv2-related state
+ macros to prevent a macro duplication in userland applications.
+ (suggested by Hitoshi Asaeda)
<200607>
2006-07-11 SUZUKI, Shinsuke <suz@alaxala.net>
View
4 kame/sys/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/* $KAME: icmp6.h,v 1.104 2006/03/06 15:31:30 t-momose Exp $ */
+/* $KAME: icmp6.h,v 1.105 2006/08/29 02:00:19 suz Exp $ */
/*
* Copyright (c) 2002 INRIA. All rights reserved.
@@ -300,12 +300,14 @@ struct mld_group_record_hdr {
/*
* Group Record Types in the MLD Membership Report
*/
+#ifndef MODE_IS_INCLUDE
#define MODE_IS_INCLUDE 1
#define MODE_IS_EXCLUDE 2
#define CHANGE_TO_INCLUDE_MODE 3
#define CHANGE_TO_EXCLUDE_MODE 4
#define ALLOW_NEW_SOURCES 5
#define BLOCK_OLD_SOURCES 6
+#endif
/*
* Neighbor Discovery

0 comments on commit 46e0d3f

Please sign in to comment.
Something went wrong with that request. Please try again.