From 4aff5407c5cf5f6c884aab44274c32ca3f9d3951 Mon Sep 17 00:00:00 2001
From: Martell Malone <martellmalone@gmail.com>
Date: Thu, 5 Mar 2015 00:31:22 +0000
Subject: [PATCH] legacythreadapi: Fixup and correct header name


diff --git a/mingw-w64-headers/include/threadpoolapilegacyset.h b/mingw-w64-headers/include/threadpoolapilegacyset.h
new file mode 100644
index 0000000..6c15cb2
--- /dev/null
+++ b/mingw-w64-headers/include/threadpoolapilegacyset.h
@@ -0,0 +1,33 @@
+/**
+ * This file is part of the mingw-w64 runtime package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
+ */
+#ifndef _THREADPOOLAPILEGACYSET_H_
+#define _THREADPOOLAPILEGACYSET_H_
+
+#include <apiset.h>
+#include <apisetcconv.h>
+#include <minwindef.h>
+#include <minwinbase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT)
+  WINBASEAPI WINBOOL WINAPI CreateTimerQueueTimer (PHANDLE phNewTimer, HANDLE TimerQueue, WAITORTIMERCALLBACK Callback, PVOID Parameter, DWORD DueTime, DWORD Period, ULONG Flags);
+  WINBASEAPI WINBOOL WINAPI DeleteTimerQueueTimer (HANDLE TimerQueue, HANDLE Timer, HANDLE CompletionEvent);
+#endif
+
+#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
+  WINBASEAPI WINBOOL WINAPI QueueUserWorkItem (LPTHREAD_START_ROUTINE Function, PVOID Context, ULONG Flags);
+  WINBASEAPI WINBOOL WINAPI UnregisterWaitEx (HANDLE WaitHandle, HANDLE CompletionEvent);
+  WINBASEAPI HANDLE WINAPI CreateTimerQueue (VOID);
+  WINBASEAPI WINBOOL WINAPI ChangeTimerQueueTimer (HANDLE TimerQueue, HANDLE Timer, ULONG DueTime, ULONG Period);
+  WINBASEAPI WINBOOL WINAPI DeleteTimerQueueEx (HANDLE TimerQueue, HANDLE CompletionEvent);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/mingw-w64-headers/include/threadpoollegacyapiset.h b/mingw-w64-headers/include/threadpoollegacyapiset.h
deleted file mode 100755
index 5bdc1ae..0000000
--- a/mingw-w64-headers/include/threadpoollegacyapiset.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * This file is part of the mingw-w64 runtime package.
- * No warranty is given; refer to the file DISCLAIMER within this package.
- */
-#ifndef _THREADPOOLLEGACYAPISET_H_
-#define _THREADPOOLLEGACYAPISET_H_
-
-#include <apiset.h>
-#include <apisetcconv.h>
-#include <minwindef.h>
-#include <minwinbase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
-  WINBASEAPI WINBOOL WINAPI QueueUserWorkItem (LPTHREAD_START_ROUTINE Function, PVOID Context, ULONG Flags);
-  WINBASEAPI WINBOOL WINAPI UnregisterWaitEx (HANDLE WaitHandle, HANDLE CompletionEvent);
-  WINBASEAPI HANDLE WINAPI CreateTimerQueue (VOID);
-  WINBASEAPI WINBOOL WINAPI CreateTimerQueueTimer (PHANDLE phNewTimer, HANDLE TimerQueue, WAITORTIMERCALLBACK Callback, PVOID Parameter, DWORD DueTime, DWORD Period, ULONG Flags);
-  WINBASEAPI WINBOOL WINAPI ChangeTimerQueueTimer (HANDLE TimerQueue, HANDLE Timer, ULONG DueTime, ULONG Period);
-  WINBASEAPI WINBOOL WINAPI DeleteTimerQueueTimer (HANDLE TimerQueue, HANDLE Timer, HANDLE CompletionEvent);
-  WINBASEAPI WINBOOL WINAPI DeleteTimerQueueEx (HANDLE TimerQueue, HANDLE CompletionEvent);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h
index a9a6809..271d953 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -36,7 +36,7 @@
 #include <sysinfoapi.h>
 #include <systemtopologyapi.h>
 #include <threadpoolapiset.h>
-#include <threadpoollegacyapiset.h>
+#include <threadpoolapilegacyset.h>
 #include <utilapiset.h>
 #include <wow64apiset.h>
 
-- 
2.3.1