diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-29 15:40:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-29 15:40:04 +0200 |
| commit | 39efa89afb10ec967bea92f02aa58c4109628e5f (patch) | |
| tree | 92a941cd0a1504ec4eefc1a07840c4b1eb9d7e46 | |
| parent | 27515921196e61034c18718812b6417f65d0337f (diff) | |
| download | vim-git-39efa89afb10ec967bea92f02aa58c4109628e5f.tar.gz | |
updated for version 7.3.1268v7.3.1268
Problem: ACL support doesn't work when when compiled with MingW.
Solution: Support ACL on MingW. (Ken Takata)
| -rw-r--r-- | src/os_win32.c | 8 | ||||
| -rw-r--r-- | src/os_win32.h | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 9d4ae0b93..421a164c5 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -489,15 +489,15 @@ DWORD g_PlatformId; * These are needed to dynamically load the ADVAPI DLL, which is not * 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); -typedef DWORD (WINAPI *PGNSECINFO) (LPSTR, enum SE_OBJECT_TYPE, +typedef DWORD (WINAPI *PGNSECINFO) (LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID *, PSID *, PACL *, PACL *, PSECURITY_DESCRIPTOR *); # 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); -typedef DWORD (WINAPI *PGNSECINFOW) (LPWSTR, enum SE_OBJECT_TYPE, +typedef DWORD (WINAPI *PGNSECINFOW) (LPWSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID *, PSID *, PACL *, PACL *, PSECURITY_DESCRIPTOR *); # endif diff --git a/src/os_win32.h b/src/os_win32.h index ce6f6d493..42cbab595 100644 --- a/src/os_win32.h +++ b/src/os_win32.h @@ -57,14 +57,11 @@ #define FEAT_SHORTCUT /* resolve shortcuts */ -#if !defined(__MINGW32__) \ - && !defined(__CYGWIN__) \ - && (!defined(__BORLANDC__) || __BORLANDC__ >= 0x550) \ +#if (!defined(__BORLANDC__) || __BORLANDC__ >= 0x550) \ && (!defined(_MSC_VER) || _MSC_VER > 1020) /* * Access Control List (actually security info). - * Mingw and Cygwin don't have the acl stuff. - * Borland only in version 5.5 and later. + * Borland has the acl stuff only in version 5.5 and later. * MSVC in 5.0, not in 4.2, don't know about 4.3. */ # define HAVE_ACL diff --git a/src/version.c b/src/version.c index d554cd601..463098792 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1268, +/**/ 1267, /**/ 1266, |