Add information about the conflict with windows.h into our document.

http://code.google.com/p/google-glog/issues/detail?id=33

git-svn-id: https://google-glog.googlecode.com/svn/trunk@79 eb4d4688-79bd-11dd-afb4-1d65580434c0

diff --git a/doc/glog.html b/doc/glog.html
index 9fe2e1f..4dce0dd 100644 (file)
--- a/doc/glog.html
+++ b/doc/glog.html
@@ -524,6 +524,22 @@ setting <code>GOOGLE_STRIP_LOG</code> to 1 or greater removes
 all log messages associated with <code>VLOG</code>s as well as
 <code>INFO</code> log statements.
 
+<h3><A NAME=windows>Notes for Windows users</A></h3>
+
+<p>Google glog defines a severity level <code>ERROR</code>, which is
+also defined in <code>windows.h</code>
+There are two known workarounds to avoid this conflict:
+
+<ul>
+  <li>#define <code>WIN32_LEAN_AND_MEAN</code> or <code>NOGDI</code>
+      <strong>before</strong> you #include <code>windows.h</code> .
+  <li>#undef <code>ERROR</code> <strong>after</strong> you #include
+      <code>windows.h</code> .
+</ul>
+
+<p>See <a href="http://code.google.com/p/google-glog/issues/detail?id=33">
+this issue</a> for more detail.
+
 <hr>
 <address>
 Shinichiro Hamaji<br>