Index: base/win/atlcheck.h |
=================================================================== |
--- base/win/atlcheck.h (revision 0) |
+++ base/win/atlcheck.h (revision 0) |
@@ -0,0 +1,26 @@ |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+#ifndef BASE_WIN_ATLCHECK_H_ |
+#define BASE_WIN_ATLCHECK_H_ |
+ |
+// USAGE: Put after atl headers in all headers; headers only. |
Mark Mentovai
2011/03/18 14:54:47
Put after ATL headers in all headers that include
RN
2011/03/18 16:39:56
Sounds better, done.
|
+// |
+// Windows DDK 7.1's ATL atlmem.h pulls in intsafe.h which has it's |
Mark Mentovai
2011/03/18 14:54:47
it's -> its
RN
2011/03/18 16:39:56
Done.
|
+// own version of INT/ETC_MIN/MAX which is not wrapped with an ifdef; thus, |
+// it needs to be included first. This simulates the include conflicts |
+// that occur with non-DDK ATL versions. |
+// |
+// Various ATL headers such as atlwin.h pull in atlmem.h. Including an ICU |
+// header before the ATL headers is the most likely source if an error is |
+// generated. |
+#if defined(__ATLMEM_H__) |
+# if defined(INT8_MAX) && !defined(DWORD_ERROR) // DWORD_ERROR is intsafe.h |
Mark Mentovai
2011/03/18 14:54:47
We never indent preprocessor macros at all. Pull a
RN
2011/03/18 16:39:56
Yeah, done. While the guidelines said no indentati
|
+# error Certain ATL headers must be before any third party ones |
+# endif |
+#else |
+# undef BASE_WIN_ATLCHECK_H_ // atlmem.h not included, check again |
+#endif |
+ |
+#endif // BASE_WIN_ATLCHECK_H_ |
Property changes on: base\win\atlcheck.h |
___________________________________________________________________ |
Added: svn:eol-style |
+ LF |