* flock.cc: Fix lockf copyright to latest version.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e6cd5cc..35ef486 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-13  Corinna Vinschen  <corinna@vinschen.de>
+
+       * flock.cc: Fix lockf copyright to latest version.
+
 2009-03-12  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_disk_file.cc (path_conv::isgood_inode): Move to be defined

diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc
index 964156c..b194a3f 100644 (file)
--- a/winsup/cygwin/flock.cc
+++ b/winsup/cygwin/flock.cc
@@ -60,7 +60,8 @@
 
 /* The lockf function is based upon FreeBSD sources with the following
  * copyright.
- *
+ */
+/*
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
@@ -75,13 +76,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -94,10 +88,7 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- *
- * $NetBSD: lockf.c,v 1.1 1997/12/20 20:23:18 kleink Exp $
-*/
+ */
 
 #include "winsup.h"
 #include <assert.h>