[tor-commits] [tor/master] Merge remote-tracking branch 'public/close_file_mapping'

[nickm at torproject.org]

commit 0e207f9acb655d037c8aef86ea2781d8e1b4b570
Merge: f1aae12 2e58882
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 31 12:38:11 2012 -0400

    Merge remote-tracking branch 'public/close_file_mapping'
    
    Conflicts:
    	src/common/compat.h
    
    Conflict was between replacement of MS_WINDOWS with _WIN32 in
    master, and with removal of file_handle from tor_mmap_t struct in
    close_file_mapping branch (for bug 5951 fix).

 changes/close_file_handle |    4 ++++
 src/common/compat.c       |   25 +++++++++++++------------
 src/common/compat.h       |    1 -
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --cc src/common/compat.h
index 7edd889,06aeeb1..7ba3509
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@@ -246,8 -248,7 +246,7 @@@ typedef struct tor_mmap_t 
  #ifdef HAVE_SYS_MMAN_H
    size_t mapping_size; /**< Size of the actual mapping. (This is this file
                          * size, rounded up to the nearest page.) */
 -#elif defined MS_WINDOWS
 +#elif defined _WIN32
-   HANDLE file_handle;
    HANDLE mmap_handle;
  #endif