Mailing-List:	contact cygwin-developers-help AT cygwin DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-developers-subscribe AT cygwin DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin-developers/>
List-Post:	<mailto:cygwin-developers AT cygwin DOT com>
List-Help:	<mailto:cygwin-developers-help AT cygwin DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-developers-owner AT cygwin DOT com
Delivered-To:	mailing list cygwin-developers AT cygwin DOT com
Message-ID:	<20011204032446.78586.qmail@web14510.mail.yahoo.com>
Date:	Tue, 4 Dec 2001 14:24:46 +1100 (EST)
From:	=?iso-8859-1?q?Danny=20Smith?= <danny_r_smith_2001 AT yahoo DOT co DOT nz>
Subject:	Re: [MinGW-dvlpr] Re: src/winsup/w32api ChangeLog include/commdlg.h ...
To:	CD List <Cygwin-Developers AT cygwin DOT com>,
	cygdev <cygwin-developers AT cygwin DOT com>
Cc:	MD List <MinGW-Dvlpr AT sourceforge DOT net>
In-Reply-To:	<3C0C016F.101A8B1C@yahoo.com>
MIME-Version:	1.0

 --- Earnie Boyd <earnie_boyd AT yahoo DOT com> wrote: > I have Danny Smith
looking at it.  I merged changes between mingw's and
> cygwin's cvses with conflicts in those areas.  Obviously I resolved them
> incorrectly.  Will fix sometime tomorrow.
> 
> Earnie.
> 

The reason for my changes are:

http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/sysinfo_1o1e.asp

says OSVERSIONINFO and OSVERSIONINFOEXEX are in winnt.h
Also  associated defines are in winnt.h 

even though the function GetSystemInfo is in winbase.h

I suspect merge conflicts were not resolved correctly.
I am in middle of something *very important* (baking a cake for my
daughter's birthday) but will fix sometime tomorrow 5 Dec (NZ time)

Danny

> > >       2001-11-23  Danny Smith  <dannysmith AT users DOT sourceforge DOT 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 AT vinschen DOT de>
> > >
> > >       * include/winbase.h (OSVERSIONINFOEX): Add definition.
> > >       * include/winnt.h: Add VER_NT_* and VER_SUITE_* defines.
> > 


http://shopping.yahoo.com.au - Yahoo! Shopping
- Get organised for Christmas early this year!

- Raw text -