src/winsup/w32api ChangeLog include/commdlg.h ...

[Corinna Vinschen]

On Mon, Dec 03, 2001 at 07:59:35PM -0000, earnie@cygwin.com wrote:
> CVSROOT:	/cvs/src
> Module name:	src
> Changes by:	earnie@sources.redhat.com	2001-12-03 11:59:35
> 
> Modified files:
> 	winsup/w32api  : ChangeLog 
> 	winsup/w32api/include: commdlg.h ipexport.h iphlpapi.h iptypes.h 
> 	                       rpcdcep.h rpcproxy.h winbase.h windef.h 
> 	                       windows.h winnt.h winsock.h winsock2.h 
> 	                       winuser.h 
> 	winsup/w32api/lib: advapi32.def dinput.c iphlpapi.def kernel32.c 
> 	                   scrnsave.c test.c user32.def 
> Added files:
> 	winsup/w32api/include: accctrl.h aclapi.h 
> 
> Log message:
> 	2001-12-03  Earnie Boyd  <earnie@users.sf.net>
> [...]
> 	2001-11-23  Danny Smith  <dannysmith@users.sourceforge.net>
> 	
> 	* include/winbase.h (OSVERSIONINFO[AW],VER_PLATFORM_WIN32s,
> 	VER_PLATFORM_WIN32_WINDOWS,VER_PLATFORM_WIN32_NT): Move from
> 	here ...
> 	* include/winnt.h: ... to here.
> 	* include/winbase.h (VerifyVersionInfo[AW]): Add declaration.
> 	* include/winnt.h (OSVERSIONINFOEX[AW]): Add structure definitions
> 	and typedefs.
> 	(VER_NT_WORKSTATION,VER_NT_DOMAIN_CONTROLLER,VER_NT_SERVER):
> 	Add defines.

What's that?  This change breaks the change from

> 	2001-11-12  Corinna Vinschen  <corinna@vinschen.de>
> 	
> 	* include/winbase.h (OSVERSIONINFOEX): Add definition.
> 	* include/winnt.h: Add VER_NT_* and VER_SUITE_* defines.

Now we have three VER_NT_* defines which each is defined twice in
winnt.h and OSVERSIONINFO[AW] and OSVERSIONINFOEX[AW] are also
defined twice, in winbase.h and in winnt.h.

This breaks building setup and cygwin.

Could you please care for that, Earnie?  Otherwise I'll patch that
tomorrow according to MSDN.

Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Developer                                mailto:cygwin@cygwin.com
Red Hat, Inc.