* wincrypt.h (WINADVAPI): Define as non-import iff
_ADVAPI32_ was defined.
* wincred.h: Likewise.
* winsvc.h: Likewise.
* perflib.h: Likewise.
* winbase.h: Likewise.
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5134 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index f6c77d6..ef77c49 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,12 @@
+2012-06-27 Kai Tietz <ktietz@redhat.com>
+
+ * wincrypt.h (WINADVAPI): Define as non-import iff
+ _ADVAPI32_ was defined.
+ * wincred.h: Likewise.
+ * winsvc.h: Likewise.
+ * perflib.h: Likewise.
+ * winbase.h: Likewise.
+
2012-05-10 Kai Tietz <ktietz@redhat.com>
PR 3523077
diff --git a/mingw-w64-headers/include/perflib.h b/mingw-w64-headers/include/perflib.h
index 92e4ce8..5305cdd 100644
--- a/mingw-w64-headers/include/perflib.h
+++ b/mingw-w64-headers/include/perflib.h
@@ -12,7 +12,11 @@
#endif
#ifndef WINADVAPI
+#ifndef _ADVAPI32_
#define WINADVAPI DECLSPEC_IMPORT
+#else
+#define WINADVAPI
+#endif
#endif
typedef LPVOID (CALLBACK *PERF_MEM_ALLOC)(SIZE_T AllocSize,LPVOID pContext);
diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h
index 640a02c..b7aa8f5 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -8,7 +8,14 @@
#include <_mingw_unicode.h>
+#ifndef WINADVAPI
+#ifndef _ADVAPI32_
#define WINADVAPI DECLSPEC_IMPORT
+#else
+#define WINADVAPI
+#endif
+#endif
+
#define WINBASEAPI DECLSPEC_IMPORT
#define ZAWPROXYAPI DECLSPEC_IMPORT
diff --git a/mingw-w64-headers/include/wincred.h b/mingw-w64-headers/include/wincred.h
index 93d3db3..4b8433c 100644
--- a/mingw-w64-headers/include/wincred.h
+++ b/mingw-w64-headers/include/wincred.h
@@ -9,7 +9,13 @@
#include <_mingw.h>
#include <_mingw_unicode.h>
+#ifndef WINADVAPI
+#ifndef _ADVAPI32_
#define WINADVAPI DECLSPEC_IMPORT
+#else
+#define WINADVAPI
+#endif
+#endif
#ifndef CREDUIAPI
#ifndef _CREDUI_
diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h
index 8a898b0..810e062 100644
--- a/mingw-w64-headers/include/wincrypt.h
+++ b/mingw-w64-headers/include/wincrypt.h
@@ -30,7 +30,11 @@
#endif
#ifndef WINADVAPI
+#ifndef _ADVAPI32_
#define WINADVAPI WINIMPM
+#else
+#define WINADVAPI
+#endif
#endif
diff --git a/mingw-w64-headers/include/winsvc.h b/mingw-w64-headers/include/winsvc.h
index 51a8785..55108fa 100644
--- a/mingw-w64-headers/include/winsvc.h
+++ b/mingw-w64-headers/include/winsvc.h
@@ -10,7 +10,11 @@
#include <_mingw_unicode.h>
#ifndef WINADVAPI
+#ifndef _ADVAPI32_
#define WINADVAPI DECLSPEC_IMPORT
+#else
+#define WINADVAPI
+#endif
#endif
#ifdef __cplusplus
