r8724@Kushana: nickm | 2006-09-06 04:32:28 -0400

Fix spaces; restore support for mapping files over 4GB on win32 (?)


svn:r8326
This commit is contained in:
Nick Mathewson 2006-09-06 08:42:16 +00:00
parent dffa692d05
commit 000b7b287c
3 changed files with 14 additions and 20 deletions

View File

@ -181,8 +181,8 @@ tor_mmap_file(const char *filename)
res->mmap_handle = CreateFileMapping(res->file_handle, res->mmap_handle = CreateFileMapping(res->file_handle,
NULL, NULL,
PAGE_READONLY, PAGE_READONLY,
0, (res->base.size >> 32),
res->base.size, (res->base.size & 0xfffffffful),
NULL); NULL);
if (res->mmap_handle != INVALID_HANDLE_VALUE) if (res->mmap_handle != INVALID_HANDLE_VALUE)
goto err; goto err;
@ -809,8 +809,6 @@ static int uname_result_is_set = 0;
const char * const char *
get_uname(void) get_uname(void)
{ {
#ifdef HAVE_UNAME #ifdef HAVE_UNAME
struct utsname u; struct utsname u;
#endif #endif
@ -864,7 +862,6 @@ get_uname(void)
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.dwOSVersionInfoSize = sizeof(info); info.dwOSVersionInfoSize = sizeof(info);
if (! GetVersionEx((LPOSVERSIONINFO)&info)) { if (! GetVersionEx((LPOSVERSIONINFO)&info)) {
strlcpy(uname_result, "Bizarre version of Windows where GetVersionEx" strlcpy(uname_result, "Bizarre version of Windows where GetVersionEx"
" doesn't work.", sizeof(uname_result)); " doesn't work.", sizeof(uname_result));
uname_result_is_set = 1; uname_result_is_set = 1;
@ -1004,7 +1001,6 @@ spawn_func(void (*func)(void *), void *data)
/** End the current thread/process. /** End the current thread/process.
*/ */
void void
spawn_exit(void) spawn_exit(void)
{ {

View File

@ -319,9 +319,7 @@ unsigned long tor_get_thread_id(void);
#define VER_SUITE_SINGLEUSERTS 0x00000100 #define VER_SUITE_SINGLEUSERTS 0x00000100
#endif #endif
#endif
#endif
#endif #endif