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

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


svn:r8326

src/common/compat.c

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

src/common/compat.h

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