.

diff --git a/ChangeLog b/ChangeLog
index 525fb44591e66910d955c36967c8c9f8aba4b4f2..d5c64d55f4448ce3fab83950c8e0d444d4285324 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-01  Roland McGrath  <roland@redhat.com>
 
+       * net.c (sockpacketoptions): Make PACKET_ADD_MEMBERSHIP and
+       PACKET_DROP_MEMBERSHIP conditional.
+       From Bernhard Fischer <rep.dot.nop@gmail.com>.
+
        * configure.ac: Match sh64* for SH64, sh* for SH.
        Reported by Bernhard Fischer <rep.dot.nop@gmail.com>.