updated for version 7.3.1268
Problem: ACL support doesn't work when when compiled with MingW.
Solution: Support ACL on MingW. (Ken Takata)
diff --git a/src/os_win32.c b/src/os_win32.c
index 9d4ae0b..421a164 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -489,15 +489,15 @@
* 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 ce6f6d4..42cbab5 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 d554cd6..4630987 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1268,
+/**/
1267,
/**/
1266,