From: Juho Snellman Date: Thu, 7 Sep 2006 01:58:12 +0000 (+0000) Subject: 0.9.16.20: X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=5d898ab44ba36a8fea525d8d6b95224c8ac13a54;p=sbcl.git 0.9.16.20: Some win32 cleanups (patch by Jack Unrue on sbcl-devel, 2006-08-31). * Replace remaining calls to perror() with fprintf(stderr, ..., GetLastError()) since errno is not set by Win32 API calls. * Disable debug output from os_map(). --- diff --git a/src/runtime/win32-os.c b/src/runtime/win32-os.c index eba3a6a..55117d7 100644 --- a/src/runtime/win32-os.c +++ b/src/runtime/win32-os.c @@ -146,7 +146,7 @@ os_validate(os_vm_address_t addr, os_vm_size_t len) /* the simple case first */ os_vm_address_t real_addr; if (!(real_addr = VirtualAlloc(addr, len, MEM_COMMIT, PAGE_EXECUTE_READWRITE))) { - perror("VirtualAlloc"); + fprintf(stderr, "VirtualAlloc: 0x%lx.\n", GetLastError()); return 0; } @@ -154,7 +154,7 @@ os_validate(os_vm_address_t addr, os_vm_size_t len) } if (!VirtualQuery(addr, &mem_info, sizeof mem_info)) { - perror("VirtualQuery"); + fprintf(stderr, "VirtualQuery: 0x%lx.\n", GetLastError()); return 0; } @@ -166,7 +166,7 @@ os_validate(os_vm_address_t addr, os_vm_size_t len) } if (!VirtualAlloc(addr, len, (mem_info.State == MEM_RESERVE)? MEM_COMMIT: MEM_RESERVE, PAGE_EXECUTE_READWRITE)) { - perror("VirtualAlloc"); + fprintf(stderr, "VirtualAlloc: 0x%lx.\n", GetLastError()); return 0; } @@ -192,7 +192,7 @@ void os_invalidate(os_vm_address_t addr, os_vm_size_t len) { if (!VirtualFree(addr, len, MEM_DECOMMIT)) { - perror("VirtualFree"); + fprintf(stderr, "VirtualFree: 0x%lx.\n", GetLastError()); } } @@ -212,11 +212,13 @@ os_map(int fd, int offset, os_vm_address_t addr, os_vm_size_t len) { os_vm_size_t count; +#if 0 fprintf(stderr, "os_map: %d, 0x%x, %p, 0x%x.\n", fd, offset, addr, len); fflush(stderr); +#endif if (!VirtualAlloc(addr, len, MEM_COMMIT, PAGE_EXECUTE_READWRITE)) { - perror("VirtualAlloc"); + fprintf(stderr, "VirtualAlloc: 0x%lx.\n", GetLastError()); lose("os_map: VirtualAlloc failure"); } diff --git a/version.lisp-expr b/version.lisp-expr index 7bdfad9..e08a07b 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.16.19" +"0.9.16.20"