Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/grit/grit/tool/resize.py

Issue 6676030: WinDDK ATL and MSVC express compatability (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Address OS_WIN ifdefs in source files; update to 78547 and fix merge conflict Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc ('K') | « tools/grit/grit/format/rc.py ('k') | ui/base/win/window_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/grit/grit/tool/resize.py
===================================================================
--- tools/grit/grit/tool/resize.py (revision 78547)
+++ tools/grit/grit/tool/resize.py (working copy)
@@ -75,8 +75,11 @@
// be ignored by GRIT.
#include "resource.h"
-#include <winres.h>
#include <winresrc.h>
+#ifdef IDC_STATIC
+#undef IDC_STATIC
+#endif
+#define IDC_STATIC (-1)
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
« chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc ('K') | « tools/grit/grit/format/rc.py ('k') | ui/base/win/window_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698