https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=fc6569a7521a57551f404759df79e20a3e1d722f
commit fc6569a7521a57551f404759df79e20a3e1d722f Author: Jon Turney <[email protected]> Date: Wed Dec 10 11:14:09 2025 +0000 Cygwin: Drop __MINGW64_VERSION_MAJOR version conditionals Unneeded now we check the version at configure-time. Diff: --- winsup/cygwin/local_includes/ntdll.h | 31 ------------------------------- winsup/cygwin/sec/auth.cc | 19 ------------------- 2 files changed, 50 deletions(-) diff --git a/winsup/cygwin/local_includes/ntdll.h b/winsup/cygwin/local_includes/ntdll.h index 19908935f..e7afeb564 100644 --- a/winsup/cygwin/local_includes/ntdll.h +++ b/winsup/cygwin/local_includes/ntdll.h @@ -490,30 +490,6 @@ typedef struct _FILE_DISPOSITION_INFORMATION_EX // 64 ULONG Flags; } FILE_DISPOSITION_INFORMATION_EX, *PFILE_DISPOSITION_INFORMATION_EX; -#if __MINGW64_VERSION_MAJOR < 13 - -typedef struct _FILE_STAT_INFORMATION // 68 -{ - LARGE_INTEGER FileId; - LARGE_INTEGER CreationTime; - LARGE_INTEGER LastAccessTime; - LARGE_INTEGER LastWriteTime; - LARGE_INTEGER ChangeTime; - LARGE_INTEGER AllocationSize; - LARGE_INTEGER EndOfFile; - ULONG FileAttributes; - ULONG ReparseTag; - ULONG NumberOfLinks; - ACCESS_MASK EffectiveAccess; -} FILE_STAT_INFORMATION, *PFILE_STAT_INFORMATION; - -typedef struct _FILE_CASE_SENSITIVE_INFORMATION // 71 -{ - ULONG Flags; -} FILE_CASE_SENSITIVE_INFORMATION, *PFILE_CASE_SENSITIVE_INFORMATION; - -#endif - enum { FILE_LINK_REPLACE_IF_EXISTS = 0x01, FILE_LINK_POSIX_SEMANTICS = 0x02, @@ -545,13 +521,6 @@ enum FILE_RENAME_IGNORE_READONLY_ATTRIBUTE = 0x40 }; -#if (__MINGW64_VERSION_MAJOR < 11) -enum -{ - FILE_CS_FLAG_CASE_SENSITIVE_DIR = 0x01 -}; -#endif - enum { FILE_PIPE_QUEUE_OPERATION = 0, diff --git a/winsup/cygwin/sec/auth.cc b/winsup/cygwin/sec/auth.cc index f9906a55c..ac9c258a5 100644 --- a/winsup/cygwin/sec/auth.cc +++ b/winsup/cygwin/sec/auth.cc @@ -693,25 +693,6 @@ out: * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* In w32api prior to 10.0.0, MsV1_0S4ULogon and MSV1_0_S4U_LOGON are only - defined in ddk/ntifs.h, which we can't include. */ -#if (__MINGW64_VERSION_MAJOR < 10) - -#define MsV1_0S4ULogon ((MSV1_0_LOGON_SUBMIT_TYPE) 12) - -typedef struct _MSV1_0_S4U_LOGON -{ - MSV1_0_LOGON_SUBMIT_TYPE MessageType; - ULONG Flags; - UNICODE_STRING UserPrincipalName; - UNICODE_STRING DomainName; -} MSV1_0_S4U_LOGON, *PMSV1_0_S4U_LOGON; - -/* Missing in Mingw-w64 */ -#define KERB_S4U_LOGON_FLAG_IDENTIFY 0x08 - -#endif - /* If logon is true we need an impersonation token. Otherwise we just need an identification token, e. g. to fetch the group list. */ HANDLE
