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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/grit/grit/format/rc.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') | « content/browser/geolocation/win7_location_api_win.h ('k') | tools/grit/grit/tool/resize.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/grit/grit/format/rc.py
===================================================================
--- tools/grit/grit/format/rc.py (revision 78547)
+++ tools/grit/grit/format/rc.py (working copy)
@@ -309,8 +309,11 @@
// This file is automatically generated by GRIT. Do not edit.
#include "%s"
-#include <winres.h>
#include <winresrc.h>
+#ifdef IDC_STATIC
+#undef IDC_STATIC
+#endif
+#define IDC_STATIC (-1)
%s
« chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc ('K') | « content/browser/geolocation/win7_location_api_win.h ('k') | tools/grit/grit/tool/resize.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698