Add new header apisetcconv.h and added its use to headers git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5862 4407c894-4637-0410-b4f5-ada5f102cad1

diff --git a/mingw-w64-headers/include/apisetcconv.h b/mingw-w64-headers/include/apisetcconv.h
new file mode 100755
index 0000000..bf0045d
--- /dev/null
+++ b/mingw-w64-headers/include/apisetcconv.h

@@ -0,0 +1,97 @@
+/**
+ * This file is part of the mingw-w64 runtime package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
+ */
+
+#ifndef _APISETCCONV_
+#define _APISETCCONV_
+
+#ifndef CMAPI
+#ifndef _CFGMGR32_
+#define CMAPI DECLSPEC_IMPORT
+#else
+#define CMAPI
+#endif
+#endif
+
+#ifndef CREDUIAPI
+#ifndef _CREDUI_
+#define CREDUIAPI DECLSPEC_IMPORT
+#else
+#define CREDUIAPI
+#endif
+#endif
+
+#ifndef WINABLEAPI
+#ifndef _USER32_
+#define WINABLEAPI DECLSPEC_IMPORT
+#else
+#define WINABLEAPI
+#endif
+#endif
+
+#ifndef WINADVAPI
+#ifndef _ADVAPI32_
+#define WINADVAPI DECLSPEC_IMPORT
+#else
+#define WINADVAPI
+#endif
+#endif
+
+#ifndef WINBASEAPI
+#ifndef _KERNEL32_
+#define WINBASEAPI DECLSPEC_IMPORT
+#else
+#define WINBASEAPI
+#endif
+#endif
+
+#ifndef WINUSERAPI
+#ifndef _USER32_
+#define WINUSERAPI DECLSPEC_IMPORT
+#else
+#define WINUSERAPI
+#endif
+#endif
+
+#ifndef ZAWPROXYAPI
+#ifndef _ZAWPROXY_
+#define ZAWPROXYAPI DECLSPEC_IMPORT
+#else
+#define ZAWPROXYAPI
+#endif
+#endif
+
+#ifndef WINCFGMGR32API
+#ifndef _SETUPAPI_
+#define WINCFGMGR32API DECLSPEC_IMPORT
+#else
+#define WINCFGMGR32API
+#endif
+#endif
+
+#ifndef WINDEVQUERYAPI
+#ifndef _CFGMGR32_
+#define WINDEVQUERYAPI DECLSPEC_IMPORT
+#else
+#define WINDEVQUERYAPI
+#endif
+#endif
+
+#ifndef WINSWDEVICEAPI
+#ifndef _CFGMGR32_
+#define WINSWDEVICEAPI DECLSPEC_IMPORT
+#else
+#define WINSWDEVICEAPI
+#endif
+#endif
+
+#ifndef WINPATHCCHAPI
+#ifndef STATIC_PATHCCH
+#define WINPATHCCHAPI WINBASEAPI 
+#else  
+#define WINPATHCCHAPI
+#endif  
+#endif
+
+#endif

diff --git a/mingw-w64-headers/include/cfgmgr32.h b/mingw-w64-headers/include/cfgmgr32.h
index b51a8ad..a0cbd7a 100644
--- a/mingw-w64-headers/include/cfgmgr32.h
+++ b/mingw-w64-headers/include/cfgmgr32.h

@@ -9,17 +9,12 @@
 #include <_mingw_unicode.h>
 #include <cfg.h>
 #include <guiddef.h>
+#include <apisetcconv.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef _CFGMGR32_
-#define CMAPI DECLSPEC_IMPORT
-#else
-#define CMAPI
-#endif
-
   typedef CONST VOID *PCVOID;
 
 #define MAX_DEVICE_ID_LEN 200

diff --git a/mingw-w64-headers/include/perflib.h b/mingw-w64-headers/include/perflib.h
index 1b19762..31b9a1a 100644
--- a/mingw-w64-headers/include/perflib.h
+++ b/mingw-w64-headers/include/perflib.h

@@ -11,13 +11,7 @@
 extern "C" {
 #endif
 
-#ifndef WINADVAPI
-#ifndef _ADVAPI32_
-#define WINADVAPI DECLSPEC_IMPORT
-#else
-#define WINADVAPI
-#endif
-#endif
+#include <apisetcconv.h>
 
 typedef LPVOID (CALLBACK *PERF_MEM_ALLOC)(SIZE_T AllocSize,LPVOID pContext);
 typedef ULONG (WINAPI *PERFLIBREQUEST)(ULONG RequestCode,PVOID Buffer,ULONG BufferSize);

diff --git a/mingw-w64-headers/include/winable.h b/mingw-w64-headers/include/winable.h
index b4493a2..ecfcca4 100644
--- a/mingw-w64-headers/include/winable.h
+++ b/mingw-w64-headers/include/winable.h

@@ -6,11 +6,7 @@
 #ifndef _WINABLE_
 #define _WINABLE_
 
-#ifndef _WINABLE_
-#define WINABLEAPI DECLSPEC_IMPORT
-#else
-#define WINABLEAPI
-#endif
+#include <apisetcconv.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h
index 0891d34..909a204 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h

@@ -8,27 +8,7 @@
 
 #include <_mingw_unicode.h>
 
-#ifndef WINADVAPI
-#ifndef _ADVAPI32_
-#define WINADVAPI DECLSPEC_IMPORT
-#else
-#define WINADVAPI
-#endif
-#endif
-
-#ifndef WINBASEAPI
-#ifndef _KERNEL32_
-#define WINBASEAPI DECLSPEC_IMPORT
-#else
-#define WINBASEAPI
-#endif
-#endif
-
-#ifndef _ZAWPROXY_
-#define ZAWPROXYAPI DECLSPEC_IMPORT
-#else
-#define ZAWPROXYAPI
-#endif
+#include <apisetcconv.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/mingw-w64-headers/include/wincred.h b/mingw-w64-headers/include/wincred.h
index 88c80bb..7525870 100644
--- a/mingw-w64-headers/include/wincred.h
+++ b/mingw-w64-headers/include/wincred.h

@@ -8,22 +8,7 @@
 
 #include <_mingw.h>
 #include <_mingw_unicode.h>
-
-#ifndef WINADVAPI
-#ifndef _ADVAPI32_
-#define WINADVAPI DECLSPEC_IMPORT
-#else
-#define WINADVAPI
-#endif
-#endif
-
-#ifndef CREDUIAPI
-#ifndef _CREDUI_
-#define CREDUIAPI DECLSPEC_IMPORT
-#else
-#define CREDUIAPI
-#endif
-#endif
+#include <apisetcconv.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h
index 5a79d1e..de80df6 100644
--- a/mingw-w64-headers/include/wincrypt.h
+++ b/mingw-w64-headers/include/wincrypt.h

@@ -29,14 +29,7 @@
 #define WINIMPM	DECLSPEC_IMPORT
 #endif
 
-#ifndef WINADVAPI
-#ifndef _ADVAPI32_
-#define WINADVAPI WINIMPM
-#else
-#define WINADVAPI
-#endif
-#endif
-
+#include <apisetcconv.h>
 
 #ifndef WINAPI
 #define WINAPI __stdcall

diff --git a/mingw-w64-headers/include/winsvc.h b/mingw-w64-headers/include/winsvc.h
index 891612c..182db889 100644
--- a/mingw-w64-headers/include/winsvc.h
+++ b/mingw-w64-headers/include/winsvc.h

@@ -8,14 +8,7 @@
 
 #include <_mingw.h>
 #include <_mingw_unicode.h>
-
-#ifndef WINADVAPI
-#ifndef _ADVAPI32_
-#define WINADVAPI DECLSPEC_IMPORT
-#else
-#define WINADVAPI
-#endif
-#endif
+#include <apisetcconv.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/mingw-w64-headers/include/winuser.h b/mingw-w64-headers/include/winuser.h
index 3074e0d..9a061db 100644
--- a/mingw-w64-headers/include/winuser.h
+++ b/mingw-w64-headers/include/winuser.h

@@ -7,12 +7,7 @@
 #define _WINUSER_
 
 #include <_mingw_unicode.h>
-
-#ifdef _USER32_
-#define WINUSERAPI
-#else
-#define WINUSERAPI DECLSPEC_IMPORT
-#endif
+#include <apisetcconv.h>
 
 #ifdef __cplusplus
 extern "C" {