Merge "Change preprocessor check to _WIN32"
authorYaowu Xu <yaowu@google.com>
Fri, 11 Jun 2010 18:14:25 +0000 (11:14 -0700)
committerCode Review <code-review@webmproject.org>
Fri, 11 Jun 2010 18:14:25 +0000 (11:14 -0700)

Trivial merge