diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index f700246b2..54c62f132 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -123,7 +123,6 @@ * net.cc (cygwin_getsockopt): Dereference optlen pointer when passing to __check_null_invalid_struct_errno. ->>>>>>> 1.1060 2001-12-03 Christopher Faylor * net.cc (cygwin_getsockopt): Allow NULL optval.