# 
# 
# patch "ChangeLog"
#  from [bbf06154de0f1e7ff9c99694d8b3c03a6aff7c28]
#    to [de01cc9b97b03abc6ea0f28102db5694a0992f30]
# 
# patch "netxx_pipe.cc"
#  from [66d4dcf236cc6c230626cec1ea10aa97b838543c]
#    to [d9494a5a9e6551dcb2ff2e87393a0fef588b5c0c]
# 
# patch "netxx_pipe.hh"
#  from [f4d50d5b3f45a9483c2102edf21268841bae7534]
#    to [2e94d631e0eb884df827f30027826e2a71c77a2b]
# 
# patch "rcs_file.cc"
#  from [fe17ed7854a347fe0998167fd80e54cea935ceb3]
#    to [2e3d946b25f5fdb0c8a1558703680d9833456b7c]
# 
# patch "tester.cc"
#  from [35367b9206fd4ade47c190dd37b49397705781f4]
#    to [205de832d5a3ec037a74410a74301238d2db2f09]
# 
============================================================
--- ChangeLog	bbf06154de0f1e7ff9c99694d8b3c03a6aff7c28
+++ ChangeLog	de01cc9b97b03abc6ea0f28102db5694a0992f30
@@ -1,3 +1,8 @@
+2007-02-08  Matthew Gregan  <address@hidden>
+
+	* netxx_pipe.{cc,hh}, rcs_file.cc, tester.cc: Add
+	WIN32_LEAN_AND_MEAN defines where we include windws.h
+
 2007-02-07  Matthew Gregan  <address@hidden>
 
 	* win32/fs.cc (rename_clobberingly_impl): GNU style.
============================================================
--- netxx_pipe.cc	66d4dcf236cc6c230626cec1ea10aa97b838543c
+++ netxx_pipe.cc	d9494a5a9e6551dcb2ff2e87393a0fef588b5c0c
@@ -13,6 +13,7 @@
 #include <netxx/streamserver.h>
 
 #ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <io.h>
 #include <fcntl.h>
============================================================
--- netxx_pipe.hh	f4d50d5b3f45a9483c2102edf21268841bae7534
+++ netxx_pipe.hh	2e94d631e0eb884df827f30027826e2a71c77a2b
@@ -15,7 +15,8 @@
 #include <netxx/socket.h>
 #include <netxx/streambase.h>
 #ifdef WIN32
-#  include <windows.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #endif
 
 /*
============================================================
--- rcs_file.cc	fe17ed7854a347fe0998167fd80e54cea935ceb3
+++ rcs_file.cc	2e3d946b25f5fdb0c8a1558703680d9833456b7c
@@ -15,6 +15,7 @@
 #include <vector>
 
 #ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 
============================================================
--- tester.cc	35367b9206fd4ade47c190dd37b49397705781f4
+++ tester.cc	205de832d5a3ec037a74410a74301238d2db2f09
@@ -50,6 +50,7 @@ sanity & global_sanity = real_sanity;
 
 
 #ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 bool make_accessible(string const &name)
 {