Skip to content

Commit 091dc3b

Browse files
yukawayukawa
committed
Remove a workaround code for Visual C++ 2010 (KB813540)
Mozc no longer supports Visual C++ 2010. We don't need to work around KB813540 anymore. http://support.microsoft.com/kb/813540 This is just a removal of dead code. No behavior change is intended. BUG=none TEST=compile git-svn-id: https://mozc.googlecode.com/svn/trunk@510 a6090854-d499-a067-5803-1114d4e51264
1 parent 1423238 commit 091dc3b

File tree

68 files changed

+66
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+66
-187
lines changed

‎src/base/update_checker.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
#include <Windows.h>
3434
#include <tchar.h>
3535
#include <strsafe.h>
36-
// Workaround against KB813540
37-
#include <atlbase_mozc.h>
36+
#include <atlbase.h>
3837
#include <atlcom.h>
3938

4039
#include <string>

‎src/base/win_util.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@
3636
#include <Psapi.h>
3737
#include <Winternl.h>
3838

39-
// Workaround against KB813540
4039
#define _ATL_NO_AUTOMATIC_NAMESPACE
4140
#define _WTL_NO_AUTOMATIC_NAMESPACE
42-
#include <atlbase_mozc.h>
41+
#include <atlbase.h>
4342

4443
#include <clocale>
4544
#include <memory>

‎src/config/stats_config_util.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
#include <shlobj.h>
3636
#include <time.h>
3737
#include <sddl.h>
38-
// Workaround against KB813540
39-
#include <atlbase_mozc.h>
38+
#include <atlbase.h>
4039
#else
4140
#include <pwd.h>
4241
#include <sys/stat.h>

‎src/gui/base/win_util.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
#include <vssym32.h>
3737
#include <windows.h>
3838
#include <winuser.h>
39-
// Workaround against KB813540
40-
#include <atlbase_mozc.h>
39+
#include <atlbase.h>
4140
#include <atlcom.h>
4241
#include <atlstr.h>
4342
#include <atlwin.h>

‎src/gyp/common.gypi

-5
Original file line numberDiff line numberDiff line change
@@ -684,11 +684,6 @@
684684
'include_dirs': [
685685
'<@(msvs_includes)',
686686
'<(additional_third_party_dir)/wtl/files/include',
687-
# Add atl_wrapper dir into the 'include_dirs' so that we can
688-
# include the header file as <atlbase_mozc.h>, which
689-
# is more lintian-friendly than "atlbase_mozc.h".
690-
# See b/5101916 for the background information.
691-
'<(DEPTH)/win32/atl_wrapper',
692687
],
693688
'msvs_cygwin_shell': 0,
694689
'msvs_disabled_warnings': ['<@(msvc_disabled_warnings)'], # /wdXXXX

‎src/mozc_version_template.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MAJOR=2
22
MINOR=16
3-
BUILD=2036
3+
BUILD=2037
44
REVISION=102
55
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
66
# downloaded by NaCl Mozc.

‎src/renderer/renderer_style_handler.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
#include <windows.h>
3434
#define _ATL_NO_AUTOMATIC_NAMESPACE
3535
#define _WTL_NO_AUTOMATIC_NAMESPACE
36-
// Workaround against KB813540
37-
#include <atlbase_mozc.h>
36+
#include <atlbase.h>
3837
#include <atlapp.h>
3938
#include <atlgdi.h>
4039
#endif // OS_WIN

‎src/renderer/win32/candidate_window.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
#include <windows.h>
3434
#define _ATL_NO_AUTOMATIC_NAMESPACE
3535
#define _WTL_NO_AUTOMATIC_NAMESPACE
36-
// Workaround against KB813540
37-
#include <atlbase_mozc.h>
36+
#include <atlbase.h>
3837
#include <atlwin.h>
3938
#include <atlapp.h>
4039
#include <atlcrack.h>

‎src/renderer/win32/composition_window.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
#include <windows.h>
3333
#define _ATL_NO_AUTOMATIC_NAMESPACE
3434
#define _WTL_NO_AUTOMATIC_NAMESPACE
35-
// Workaround against KB813540
36-
#include <atlbase_mozc.h>
35+
#include <atlbase.h>
3736
#include <atlapp.h>
3837
#include <atlcrack.h>
3938
#include <atlgdi.h>

‎src/renderer/win32/indicator_window.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
#include <windows.h>
3333
#define _ATL_NO_AUTOMATIC_NAMESPACE
3434
#define _WTL_NO_AUTOMATIC_NAMESPACE
35-
// Workaround against KB813540
36-
#include <atlbase_mozc.h>
35+
#include <atlbase.h>
3736
#include <atlwin.h>
3837
#include <atlapp.h>
3938
#include <atlcrack.h>

‎src/renderer/win32/infolist_window.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
#include <windows.h>
3434
#define _ATL_NO_AUTOMATIC_NAMESPACE
3535
#define _WTL_NO_AUTOMATIC_NAMESPACE
36-
// Workaround against KB813540
37-
#include <atlbase_mozc.h>
36+
#include <atlbase.h>
3837
#include <atlwin.h>
3938
#include <atlapp.h>
4039
#include <atlcrack.h>

‎src/renderer/win32/text_renderer.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlcom.h>
3736
#include <objbase.h>
3837
#include <d2d1.h>

‎src/renderer/win32/text_renderer.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
#include <windows.h>
3434
#define _ATL_NO_AUTOMATIC_NAMESPACE
3535
#define _WTL_NO_AUTOMATIC_NAMESPACE
36-
// Workaround against KB813540
37-
#include <atlbase_mozc.h>
36+
#include <atlbase.h>
3837
#include <atlapp.h>
3938
#include <atlmisc.h>
4039

‎src/renderer/win32/win32_image_util.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333

3434
#define _ATL_NO_AUTOMATIC_NAMESPACE
3535
#define _WTL_NO_AUTOMATIC_NAMESPACE
36-
// Workaround against KB813540
37-
#include <atlbase_mozc.h>
36+
#include <atlbase.h>
3837
#include <atlapp.h>
3938
#include <atlmisc.h>
4039
#include <atlgdi.h>

‎src/renderer/win32/win32_image_util_test.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlapp.h>
3736
#include <atlgdi.h>
3837
#include <atlmisc.h>

‎src/renderer/win32/win32_renderer_util.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlapp.h>
3736
#include <atlgdi.h>
3837
#include <atlmisc.h>

‎src/renderer/win32/win32_renderer_util_test.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlapp.h>
3736
#include <atlgdi.h>
3837
#include <atlmisc.h>

‎src/server/mozc_cache_service.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
#define PSAPI_VERSION 1 // for <psapi.h>
3232
#include <windows.h>
3333
#if !defined(NO_LOGGING)
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlstr.h> // for CString
3736
#endif // !NO_LOGGING
3837
#include <psapi.h>

‎src/win32/atl_wrapper/atlbase_mozc.h

-51
This file was deleted.

‎src/win32/base/accessible_object.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlcom.h>
3736

3837
#include <string>

‎src/win32/base/accessible_object.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434

3535
#define _ATL_NO_AUTOMATIC_NAMESPACE
3636
#define _WTL_NO_AUTOMATIC_NAMESPACE
37-
// Workaround against KB813540
38-
#include <atlbase_mozc.h>
37+
#include <atlbase.h>
3938
#include <atlcom.h>
4039

4140
#include <vector>

‎src/win32/base/browser_info.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlcom.h>
3736

3837
#include <string>

‎src/win32/base/focus_hierarchy_observer.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlcom.h>
3736

3837
#include <memory>

‎src/win32/base/imm_registrar.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232

3333
#include <windows.h>
3434
#include <WinNls32.h>
35-
// Workaround against KB813540
36-
#include <atlbase_mozc.h>
35+
#include <atlbase.h>
3736
#include <strsafe.h>
3837

3938
#include <iomanip>

‎src/win32/base/imm_util.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
#include "win32/base/imm_util.h"
3131

3232
#include <windows.h>
33-
// Workaround against KB813540
34-
#include <atlbase_mozc.h>
33+
#include <atlbase.h>
3534
#include <atlstr.h>
3635
#include <imm.h>
3736
#include <msctf.h>

‎src/win32/base/migration_util.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333

3434
#define _ATL_NO_AUTOMATIC_NAMESPACE
3535
#define _WTL_NO_AUTOMATIC_NAMESPACE
36-
// Workaround against KB813540
37-
#include <atlbase_mozc.h>
36+
#include <atlbase.h>
3837
#include <atlstr.h>
3938

4039
#include <strsafe.h>

‎src/win32/base/omaha_util.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
#define _ATL_NO_AUTOMATIC_NAMESPACE
4141
#define _WTL_NO_AUTOMATIC_NAMESPACE
4242
#define _ATL_NO_HOSTING
43-
// Workaround against KB813540
44-
#include <atlbase_mozc.h>
43+
#include <atlbase.h>
4544

4645
#include <string>
4746

‎src/win32/base/text_icon.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlapp.h>
3736
#include <atlmisc.h>
3837
#include <atlgdi.h>

‎src/win32/base/text_icon_test.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlapp.h>
3736
#include <atlmisc.h>
3837
#include <atlgdi.h>

‎src/win32/base/tsf_registrar.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
#include <windows.h>
3333
#define _ATL_NO_AUTOMATIC_NAMESPACE
3434
#define _WTL_NO_AUTOMATIC_NAMESPACE
35-
// Workaround against KB813540
36-
#include <atlbase_mozc.h>
35+
#include <atlbase.h>
3736
#include <msctf.h>
3837
#include <objbase.h>
3938

‎src/win32/base/uninstall_helper.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
34-
// Workaround against KB813540
35-
#include <atlbase_mozc.h>
34+
#include <atlbase.h>
3635
#include <atlcom.h>
3736
#include <msctf.h>
3837
#include <strsafe.h>

‎src/win32/base/win32_window_util.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
#define _ATL_NO_AUTOMATIC_NAMESPACE
3333
#define _WTL_NO_AUTOMATIC_NAMESPACE
3434
#define _ATL_NO_HOSTING
35-
// Workaround against KB813540
36-
#include <atlbase_mozc.h>
35+
#include <atlbase.h>
3736
#include <atlapp.h>
3837
#include <atlwin.h>
3938
#include <atlstr.h>

‎src/win32/custom_action/custom_action.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
#include "win32/custom_action/custom_action.h"
3131

3232
#include <windows.h>
33-
// Workaround against KB813540
34-
#include <atlbase_mozc.h>
33+
#include <atlbase.h>
3534
#if !defined(NO_LOGGING)
3635
#include <atlstr.h>
3736
#endif // !NO_LOGGING

‎src/win32/ime/ime_input_context.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
#include "win32/ime/ime_input_context.h"
3131

3232
#define _ATL_NO_HOSTING // prevents including <dimm.h>
33-
// Workaround against KB813540
34-
#include <atlbase_mozc.h>
33+
#include <atlbase.h>
3534
#include <atlwin.h>
3635

3736
#include "base/logging.h"

‎src/win32/ime/ime_language_bar.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
#include <rpcsal.h>
3535
#include <msctf.h>
3636
#include <ctffunc.h>
37-
// Workaround against KB813540
38-
#include <atlbase_mozc.h>
37+
#include <atlbase.h>
3938

4039
#include "base/port.h"
4140
#include "session/commands.pb.h"

0 commit comments

Comments
 (0)