Index: miscfuncs.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/miscfuncs.cc,v
retrieving revision 1.29
diff -u -p -r1.29 miscfuncs.cc
--- miscfuncs.cc	25 Feb 2004 10:54:31 -0000	1.29
+++ miscfuncs.cc	25 Feb 2004 19:20:30 -0000
@@ -218,9 +218,10 @@ int __stdcall
 check_invalid_virtual_addr (const void *s, unsigned sz)
 {
   MEMORY_BASIC_INFORMATION mbuf;
-  void *end;
+  const void *end;
 
-  for (end = (char *) s + sz; s < end; s = (char *) s + mbuf.RegionSize)
+  for (end = (char *) s + sz; s < end;
+       s = (char *) mbuf.BaseAddress + mbuf.RegionSize)
     if (!VirtualQuery (s, &mbuf, sizeof mbuf))
       return EINVAL;
   return 0;
Index: mmap.cc
===================================================================
RCS file: /cvs/src/src/winsup/cygwin/mmap.cc,v
retrieving revision 1.94
diff -u -p -r1.94 mmap.cc
--- mmap.cc	25 Feb 2004 10:54:31 -0000	1.94
+++ mmap.cc	25 Feb 2004 19:20:30 -0000
@@ -295,7 +295,6 @@ mmap_record::alloc_fh ()
       return &fh_paging_file;
     }
 
-  static path_conv pc; // should be thread safe - CGF
   /* The file descriptor could have been closed or, even
      worse, could have been reused for another file before
      the call to fork(). This requires creating a fhandler