aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.3.1268

Browse Source 
Problem:    ACL support doesn't work when when compiled with MingW.
Solution:   Support ACL on MingW. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2013-06-29 15:40:04 +02:00
parent 2751592119
commit 39efa89afb
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/os_win32.c
View File

@ -489,15 +489,15 @@ DWORD g_PlatformId;
* These are needed to dynamically load the ADVAPI DLL, which is not * These are needed to dynamically load the ADVAPI DLL, which is not
* implemented under Windows 95 (and causes VIM to crash) * implemented under Windows 95 (and causes VIM to crash)
*/ */
typedef DWORD (WINAPI *PSNSECINFO) (LPSTR, enum SE_OBJECT_TYPE, typedef DWORD (WINAPI *PSNSECINFO) (LPSTR, SE_OBJECT_TYPE,
SECURITY_INFORMATION, PSID, PSID, PACL, PACL); SECURITY_INFORMATION, PSID, PSID, PACL, PACL);
typedef DWORD (WINAPI *PGNSECINFO) (LPSTR, enum SE_OBJECT_TYPE, typedef DWORD (WINAPI *PGNSECINFO) (LPSTR, SE_OBJECT_TYPE,
SECURITY_INFORMATION, PSID *, PSID *, PACL *, PACL *, SECURITY_INFORMATION, PSID *, PSID *, PACL *, PACL *,
PSECURITY_DESCRIPTOR *); PSECURITY_DESCRIPTOR *);
# ifdef FEAT_MBYTE # ifdef FEAT_MBYTE
typedef DWORD (WINAPI *PSNSECINFOW) (LPWSTR, enum SE_OBJECT_TYPE, typedef DWORD (WINAPI *PSNSECINFOW) (LPWSTR, SE_OBJECT_TYPE,
SECURITY_INFORMATION, PSID, PSID, PACL, PACL); SECURITY_INFORMATION, PSID, PSID, PACL, PACL);
typedef DWORD (WINAPI *PGNSECINFOW) (LPWSTR, enum SE_OBJECT_TYPE, typedef DWORD (WINAPI *PGNSECINFOW) (LPWSTR, SE_OBJECT_TYPE,
SECURITY_INFORMATION, PSID *, PSID *, PACL *, PACL *, SECURITY_INFORMATION, PSID *, PSID *, PACL *, PACL *,
PSECURITY_DESCRIPTOR *); PSECURITY_DESCRIPTOR *);
# endif # endif

7
src/os_win32.h
View File

@ -57,14 +57,11 @@
#define FEAT_SHORTCUT /* resolve shortcuts */ #define FEAT_SHORTCUT /* resolve shortcuts */
#if !defined(__MINGW32__) \ #if (!defined(__BORLANDC__) || __BORLANDC__ >= 0x550) \
&& !defined(__CYGWIN__) \
&& (!defined(__BORLANDC__) || __BORLANDC__ >= 0x550) \
&& (!defined(_MSC_VER) || _MSC_VER > 1020) && (!defined(_MSC_VER) || _MSC_VER > 1020)
/* /*
* Access Control List (actually security info). * Access Control List (actually security info).
* Mingw and Cygwin don't have the acl stuff. * Borland has the acl stuff only in version 5.5 and later.
* Borland only in version 5.5 and later.
* MSVC in 5.0, not in 4.2, don't know about 4.3. * MSVC in 5.0, not in 4.2, don't know about 4.3.
*/ */
# define HAVE_ACL # define HAVE_ACL

2
src/version.c
View File

@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1268,
/**/ /**/
1267, 1267,
/**/ /**/