diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 20:09:38 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 20:09:38 +0000 |
| commit | 192c86cf757c6b9fbb1c73aed7755e2396af7cfc (patch) | |
| tree | ebc822562e81f9804eec45589a02e01067f235ab /third_party/wtl | |
| parent | 6fc49f5689315ec0cd9a05f0a6e4dea1cf9f9e55 (diff) | |
| download | chromium_src-192c86cf757c6b9fbb1c73aed7755e2396af7cfc.zip chromium_src-192c86cf757c6b9fbb1c73aed7755e2396af7cfc.tar.gz chromium_src-192c86cf757c6b9fbb1c73aed7755e2396af7cfc.tar.bz2 | |
merge upstream patch for wtl to compile on vs2012
R=cpu@chromium.org
BUG=143646
Review URL: https://chromiumcodereview.appspot.com/11092051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/wtl')
| -rw-r--r-- | third_party/wtl/README.chromium | 4 | ||||
| -rw-r--r-- | third_party/wtl/include/atlapp.h | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/third_party/wtl/README.chromium b/third_party/wtl/README.chromium index d9eb660..9fb89b8 100644 --- a/third_party/wtl/README.chromium +++ b/third_party/wtl/README.chromium @@ -18,3 +18,7 @@ When defining NOMINMAX before including windows.h, min and max aren't defined. __min and __max are always defined though. So use them instead. This patch simply consist of a search of replace for both term." + +--- + +Cherry pick of http://sourceforge.net/tracker/index.php?func=detail&aid=1871358&group_id=109071&atid=652374 diff --git a/third_party/wtl/include/atlapp.h b/third_party/wtl/include/atlapp.h index ca424eb..4a5e6a7 100644 --- a/third_party/wtl/include/atlapp.h +++ b/third_party/wtl/include/atlapp.h @@ -457,8 +457,8 @@ static CWndClassInfo& GetWndClassInfo() \ #endif // ATLVERIFY #endif // (_ATL_VER < 0x0700) -// Forward declaration for ATL3 fix -#if (_ATL_VER < 0x0700) && defined(_ATL_DLL) && !defined(_WIN32_WCE) +// Forward declaration for ATL3 and ATL11 fix +#if (((_ATL_VER < 0x0700) && defined(_ATL_DLL)) || (_ATL_VER >= 0x0B00)) && !defined(_WIN32_WCE) namespace ATL { HRESULT AtlGetCommCtrlVersion(LPDWORD pdwMajor, LPDWORD pdwMinor); }; #endif @@ -1572,9 +1572,10 @@ public: /////////////////////////////////////////////////////////////////////////////// -// General DLL version helpers (excluded from atlbase.h if _ATL_DLL is defined) +// General DLL version helpers +// (ATL3: excluded from atlbase.h if _ATL_DLL is defined; ATL11: removed) -#if (_ATL_VER < 0x0700) && defined(_ATL_DLL) && !defined(_WIN32_WCE) +#if (((_ATL_VER < 0x0700) && defined(_ATL_DLL)) || (_ATL_VER >= 0x0B00)) && !defined(_WIN32_WCE) namespace ATL { |