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 | a35c933d736d92404b81370a60bc994f33252099 (patch) | |
tree | bb847568bc43c0925b7377e9a524a9ddeca3b4de | |
parent | 61dca1f2a6ea8975dc1c4eb17598e8b6996adcc4 (diff) | |
download | vim-a35c933d736d92404b81370a60bc994f33252099.tar.gz |
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 9d4ae0b9..421a164c 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 ce6f6d49..42cbab59 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 d554cd60..46309879 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, |