* sync.cc: Fix comment.

* dll_init.cc (dll_list::reserve_space): Use %p rather than %lx to show
reserved space.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5cb4a38ca1049374333368d95f0f5888e8cb46fe..7056124a201136f9ddda3e18769e123f065c6021 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-29  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+       * sync.cc: Fix comment.
+
+2011-11-29  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+       * dll_init.cc (dll_list::reserve_space): Use %p rather than %lx to show
+       reserved space.
+
 2011-11-29  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
        * sigproc.cc (remove_proc): Don't terminate the currently executing

diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc
index bf56c45561aec638200b536b5a67f5bf1ce6489a..12896e2ef3ac1602a9801ef9e719a6a15e2eb1de 100644 (file)
--- a/winsup/cygwin/dll_init.cc
+++ b/winsup/cygwin/dll_init.cc
@@ -427,7 +427,7 @@ dll_list::reserve_space ()
 {
   for (dll* d = dlls.istart (DLL_LOAD); d; d = dlls.inext ())
     if (!VirtualAlloc (d->handle, d->image_size, MEM_RESERVE, PAGE_NOACCESS))
-      fabort ("address space needed by '%W' (%08lx) is already occupied",
+      fabort ("address space needed by '%W' (%p) is already occupied",
              d->modname, d->handle);
 }
 

diff --git a/winsup/cygwin/sync.cc b/winsup/cygwin/sync.cc
index 0731fd18fa6e541b008de0d3648526b291bc9633..f3796272f6c259c4eb831b36d52764199ec5cfd0 100644 (file)
--- a/winsup/cygwin/sync.cc
+++ b/winsup/cygwin/sync.cc
@@ -69,8 +69,7 @@ muto::~muto ()
 
    Note: The goal here is to minimize, as much as possible, calls to the
    OS.  Hence the use of InterlockedIncrement, etc., rather than (much) more
-   expensive OS mutexes.  Also note that the only two valid "ms" times are
-   0 and INFINITE. */
+   expensive OS mutexes.  */
 int
 muto::acquire (DWORD ms)
 {