26789Re: mingw32 accctrl.h and patch (was Re: Patch 6.0.116 Failure)
- Jan 8, 2002Bram Moolenaar worte:
>Thanks for spotting this Madoka and thanks for the patch Bram.
> Madoka Machitani wrote:
> > Quoting from os_win32.h:
> > #if !defined(__MINGW32__) \
> > && !defined(__CYGWIN__) \
> > && (!defined(__BORLANDC__) || __BORLANDC__ >= 0x550) \
> > && (!defined(_MSC_VER) || _MSC_VER > 1010)
> > /*
> > * Access Control List (actually security info).
> > * Mingw and Cygwin don't have the acl stuff.
> > * Borland only in version 5.5 and later.
> > */
> > # define HAVE_ACL
> > #endif
> > As you see, HAVE_ACL is not defined when compiled under Mingw or
> > Cygwin. Ron's patch works since it includes accctrl.h outside of
> > the `#ifdef HAVE_ACL' statement.
> Thanks for pointing this out. The actual problem wasn't missing a
> header file, but using TRUSTEE when it shouldn't. Try this patch
> instead (after patch 6.0.116 and without the previous "fixes"):
> *** ../../vim60.118/src/os_win32.c Tue Jan 1 21:13:14 2002
> --- os_win32.c Sat Jan 5 13:29:06 2002
> *** 4058,4064 ****
> --- 4058,4066 ----
> BOOL aclDefault;
> HANDLE hToken;
> DWORD bytes;
> + #ifdef HAVE_ACL
> TRUSTEE t;
> + #endif
> ACCESS_MASK am;
> ACCESS_MASK cm;
> PACL pacl;
The acccctrl.h file is no longer needed and the patch works fine.
Please make an "official" patch - particularly important to those of
us using CVS - I've written a special MakeFile for the interim.
BTW, patches 119 and 120 haven't make it to CVS yet.
- << Previous post in topic