2004-04-17 Luke Dunstan <infidel@users.sourceforge.net>

	* README.w32api: List separate copyright conditions for some headers.
	* include/(winsock2.h, wsipx.h): Minor change to copyright header.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 41a4033d442daf3c11873fd6a4a90db0d151c13e..6e9e0ac9b415a10b1b52472b2246b9849372b216 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-17  Luke Dunstan  <infidel@users.sourceforge.net>
+
+       * README.w32api: List separate copyright conditions for some headers.
+       * include/(winsock2.h, wsipx.h): Minor change to copyright header.
+
 2004-04-15  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/wingdi.h (RGB): Correct macro.

diff --git a/winsup/w32api/README.w32api b/winsup/w32api/README.w32api
index e35959261493038bc1ab64d7f2308b308c95b2fc..f5b69506695ed60fd3a9157f52f942e7916a8c12 100644 (file)
--- a/winsup/w32api/README.w32api
+++ b/winsup/w32api/README.w32api
@@ -7,6 +7,8 @@
        URL: http://www.mingw.org
        Individual contributors can be found in the ChangeLog file.
 
+Unless otherwise stated in individual source files,
+
     THIS SOFTWARE IS NOT COPYRIGHTED
 
     This source code is offered for use in the public domain.  You may use,
@@ -16,3 +18,15 @@
     WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
     DISCLAIMED.  This includes but is not limited to warranties of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+Portions of winsock.h, winsock2.h and ws2tcpip.h are
+
+  Copyright (c) 1980, 1983, 1988, 1993
+  The Regents of the University of California.  All rights reserved.
+
+  Copyright (c) 1993 by Digital Equipment Corporation.
+
+gl.h is from the Mesa 3-D graphics library, Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+
+glext.h and glu.h are Copyright (c) 1991-2000 Silicon Graphics, Inc. and are subject to the SGI Free Software License B, Version 1.1
+

diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h
index aeafe4aa163111648f2661e9a7adf7d75b66e543..e3206f664f477952f42e3393c3c8532eac5f9130 100644 (file)
--- a/winsup/w32api/include/winsock2.h
+++ b/winsup/w32api/include/winsock2.h
@@ -2,7 +2,7 @@
 
   Definitions for winsock 2
 
-  Initially taken from the Wine project.
+  Contributed by the WINE project.
 
   Portions Copyright (c) 1980, 1983, 1988, 1993
   The Regents of the University of California.  All rights reserved.

diff --git a/winsup/w32api/include/wsipx.h b/winsup/w32api/include/wsipx.h
index 4f24db43bc60313c031fb3a7d8093f17d78f4ddc..ff831a147e5ca5c7376cef0c5566ea8da12de41a 100644 (file)
--- a/winsup/w32api/include/wsipx.h
+++ b/winsup/w32api/include/wsipx.h
@@ -1,4 +1,4 @@
-/* WSIPX.H - initially taken from the Wine project
+/* WSIPX.H - contributed by the WINE project
  */
 
 #ifndef _WSIPX_H