projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ATL][ATL_APITEST] Add CAtlList::InsertBefore/After + test
[reactos.git]
/
sdk
/
lib
/
atl
/
atlcore.h
diff --git
a/sdk/lib/atl/atlcore.h
b/sdk/lib/atl/atlcore.h
index
1d4ec7b
..
26f3ced
100644
(file)
--- a/
sdk/lib/atl/atlcore.h
+++ b/
sdk/lib/atl/atlcore.h
@@
-22,14
+22,18
@@
#include <malloc.h>
#include <malloc.h>
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <winnls.h>
+#ifdef __REACTOS__
+ #define WIN32_NO_STATUS
+ #define _INC_WINDOWS
+ #define COM_NO_WINDOWS_H
+ #include <stdarg.h>
+ #include <windef.h>
+ #include <winbase.h>
+ #include <winreg.h>
+ #include <winnls.h>
+#else
+ #include <windows.h>
+#endif
#include <ole2.h>
#include <olectl.h>
#include <crtdbg.h>
#include <ole2.h>
#include <olectl.h>
#include <crtdbg.h>
@@
-213,7
+217,8
@@
public:
HINSTANCE GetHInstanceAt(int i);
};
HINSTANCE GetHInstanceAt(int i);
};
-extern CAtlBaseModule _AtlBaseModule;
+__declspec(selectany) CAtlBaseModule _AtlBaseModule;
+__declspec(selectany) bool CAtlBaseModule::m_bInitFailed = false;
///
///