diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 18:34:38 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 18:34:38 +0000 |
| commit | 4e4d604e6d7d7403fb398e7ce1bd258a5896d64d (patch) | |
| tree | bc45a590cf800f4f884203d2d42170a265b7cb25 /chrome | |
| parent | 0b9d310854af7659cf6cb7e956c87bdbbe91715e (diff) | |
| download | chromium_src-4e4d604e6d7d7403fb398e7ce1bd258a5896d64d.zip chromium_src-4e4d604e6d7d7403fb398e7ce1bd258a5896d64d.tar.gz chromium_src-4e4d604e6d7d7403fb398e7ce1bd258a5896d64d.tar.bz2 | |
GTTF: Make our handling of Windows pre-processor symbols more consistent.
For example, there are differences between unit_tests and browser_tests,
which cause ridiculous problems when moving a test between those.
We're using the symbols anyway, so let's centralize it for maintainability.
TEST=compile
BUG=none
Review URL: http://codereview.chromium.org/3173044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 5 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 5 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 5 | ||||
| -rw-r--r-- | chrome/nacl.gypi | 3 | ||||
| -rw-r--r-- | chrome/renderer/render_view_browsertest.cc | 3 |
5 files changed, 1 insertions, 20 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9ca394c..a81b2fa 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -619,11 +619,6 @@ # end up using this module as well. 'conditions': [ ['OS=="win"', { - 'defines': [ - '__STD_C', - '_CRT_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', - ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index b7291ab..9d82ce4 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3335,11 +3335,6 @@ ], }], ['OS=="win"', { - 'defines': [ - '__STD_C', - '_CRT_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', - ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 0b97eec..421b784 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1501,11 +1501,6 @@ ], }], ['OS=="win"', { - 'defines': [ - '__STD_C', - '_CRT_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', - ], 'dependencies': [ 'chrome_dll_version', 'installer_util_strings', diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index e61dbbf..f3a179d 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -35,9 +35,6 @@ 'conditions': [ ['OS=="win"', { 'defines': [ - '__STD_C', - '_CRT_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', '__STDC_LIMIT_MACROS=1', ], 'include_dirs': [ diff --git a/chrome/renderer/render_view_browsertest.cc b/chrome/renderer/render_view_browsertest.cc index 8c9d9c6..f5539b4 100644 --- a/chrome/renderer/render_view_browsertest.cc +++ b/chrome/renderer/render_view_browsertest.cc @@ -495,8 +495,7 @@ TEST_F(RenderViewTest, OnPrintPageAsBitmap) { // Test that we can receive correct DOM events when we send input events // through the RenderWidget::OnHandleInputEvent() function. TEST_F(RenderViewTest, OnHandleKeyboardEvent) { - // TODO(phajdan.jr): enable on Window when sprintf is removed. -#if defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) // Load an HTML page consisting of one <input> element and three // contentediable <div> elements. // The <input> element is used for sending keyboard events, and the <div> |