From 6a28849237d7fb5b3c10134864956680c4e87328 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 29 Nov 2011 17:26:57 +0000 Subject: [PATCH] * sync.cc: Fix comment. * dll_init.cc (dll_list::reserve_space): Use %p rather than %lx to show reserved space. --- winsup/cygwin/ChangeLog | 9 +++++++++ winsup/cygwin/dll_init.cc | 2 +- winsup/cygwin/sync.cc | 3 +-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 5cb4a38ca..7056124a2 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,12 @@ +2011-11-29 Christopher Faylor + + * sync.cc: Fix comment. + +2011-11-29 Christopher Faylor + + * dll_init.cc (dll_list::reserve_space): Use %p rather than %lx to show + reserved space. + 2011-11-29 Christopher Faylor * 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 bf56c4556..12896e2ef 100644 --- 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 0731fd18f..f3796272f 100644 --- 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) {