commit 8c5c9de3f9b87306e8de94d0de3cb8e09c3b8ce3
author Liu Hao <lh_mouse@126.com> Thu Mar 16 14:13:53 2017 +0800
committer Jonathan Yong <10walls@gmail.com> Mon Mar 20 13:06:08 2017 +0000
tree 75af3e9a26efcd37d0f507bf8ff29f5c5a0eec15
parent ac71b27928aa64e163e3925dd6141c53515734c7

mingw-w64-headers/include/pdh.h: Squash each new function declaration into a single line respectively, so users don't get truncated prototypes in GCC's diagnostic messages. Put *W functions in front of *A functions because of consistency reasons.

Signed-off-by: Liu Hao <lh_mouse@126.com>
(cherry picked from commit 22cb837fe42b1573190a40698ccec3b849df869d)
Signed-off-by: Jonathan Yong <10walls@gmail.com>

mingw-w64-headers/include/pdh.h

diff --git a/mingw-w64-headers/include/pdh.h b/mingw-w64-headers/include/pdh.h
index 772aa5f..04276d3 100644
--- a/mingw-w64-headers/include/pdh.h
+++ b/mingw-w64-headers/include/pdh.h
@@ -555,36 +555,15 @@
 #define PdhVerifySQLDB __MINGW_NAME_AW(PdhVerifySQLDB)
 
 #if (_WIN32_WINNT >= 0x0600)
-PDH_FUNCTION PdhAddEnglishCounterA(
-  PDH_HQUERY hQuery,
-  LPCSTR szFullCounterPath,
-  DWORD_PTR dwUserData,
-  PDH_HCOUNTER *phCounter
-);
-
-PDH_FUNCTION PdhAddEnglishCounterW(
-  PDH_HQUERY hQuery,
-  LPCWSTR szFullCounterPath,
-  DWORD_PTR dwUserData,
-  PDH_HCOUNTER *phCounter
-);
+PDH_FUNCTION PdhAddEnglishCounterW(PDH_HQUERY hQuery,LPCWSTR szFullCounterPath,DWORD_PTR dwUserData,PDH_HCOUNTER *phCounter);
+PDH_FUNCTION PdhAddEnglishCounterA(PDH_HQUERY hQuery,LPCSTR szFullCounterPath,DWORD_PTR dwUserData,PDH_HCOUNTER *phCounter);
 
 #define PdhAddEnglishCounter __MINGW_NAME_AW(PdhAddEnglishCounter)
 
-PDH_FUNCTION PdhCollectQueryDataWithTime(
-  PDH_HQUERY hQuery,
-  LONGLONG *pllTimeStamp
-);
+PDH_FUNCTION PdhCollectQueryDataWithTime(PDH_HQUERY hQuery,LONGLONG *pllTimeStamp);
 
-PDH_FUNCTION PdhValidatePathExA(
-  PDH_HLOG hDataSource,
-  LPCSTR szFullPathBuffer
-);
-
-PDH_FUNCTION PdhValidatePathExW(
-  PDH_HLOG hDataSource,
-  LPCWSTR szFullPathBuffer
-);
+PDH_FUNCTION PdhValidatePathExW(PDH_HLOG hDataSource,LPCWSTR szFullPathBuffer);
+PDH_FUNCTION PdhValidatePathExA(PDH_HLOG hDataSource,LPCSTR szFullPathBuffer);
 
 #define PdhValidatePathEx __MINGW_NAME_AW(PdhValidatePathEx)