diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-31 12:38:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-31 12:38:11 -0400 |
| commit | 0e207f9acb655d037c8aef86ea2781d8e1b4b570 (patch) | |
| tree | bd5a76c50efb48bcdab5fd98994aa40a9c70c97c /src/common/compat.h | |
| parent | f1aae1236fc68a0047ac9370bdcf828a42efdab3 (diff) | |
| parent | 2e58882b90a5015554b59862869b20dba39a5d58 (diff) | |
| download | tor-0e207f9acb655d037c8aef86ea2781d8e1b4b570.tar.gz tor-0e207f9acb655d037c8aef86ea2781d8e1b4b570.zip | |
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).
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 7edd889ee3..7ba350945a 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -247,7 +247,6 @@ typedef struct tor_mmap_t { size_t mapping_size; /**< Size of the actual mapping. (This is this file * size, rounded up to the nearest page.) */ #elif defined _WIN32 - HANDLE file_handle; HANDLE mmap_handle; #endif |