diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-09-28 00:53:02 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-09-28 00:53:02 +0000 |
| commit | 95132f836a280890d0d69c505f65b809dd4a5179 (patch) | |
| tree | 58b1486a9d0ff8edea41f18a4cf35a8050a38800 /src | |
| parent | ba7868c7b312dc16236d3c5ac73028a4e732538c (diff) | |
| download | tor-95132f836a280890d0d69c505f65b809dd4a5179.tar tor-95132f836a280890d0d69c505f65b809dd4a5179.tar.gz | |
r8750@totoro: nickm | 2006-09-27 20:52:01 -0400
Fix some warnings on mingw; hopefully this should let us build on mingw without warnings.
svn:r8509
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/compat.c | 4 | ||||
| -rw-r--r-- | src/or/main.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index c98748bcd..cddc73103 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -185,7 +185,11 @@ tor_mmap_file(const char *filename) res->mmap_handle = CreateFileMapping(res->file_handle, NULL, PAGE_READONLY, +#if SIZEOF_SIZE_T > 4 (res->base.size >> 32), +#else + 0, +#endif (res->base.size & 0xfffffffful), NULL); if (res->mmap_handle != INVALID_HANDLE_VALUE) diff --git a/src/or/main.c b/src/or/main.c index c221c1e44..08d8c85d8 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1036,6 +1036,7 @@ second_elapsed_callback(int fd, short event, void *args) "Error from libevent when setting one-second timeout event"); } +#ifndef MS_WINDOWS /** Called when a possibly ignorable libevent error occurs; ensures that we * don't get into an infinite loop by ignoring too many errors from * libevent. */ @@ -1048,6 +1049,7 @@ got_libevent_error(void) } return 0; } +#endif /** Called when we get a SIGHUP: reload configuration files and keys, * retry all connections, re-upload all descriptors, and so on. */ |