diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-11-15 13:29:32 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-11-15 13:34:04 +0100 |
| commit | 4b8d2ad6f57e4e1c21b4af7f20bc7da0d3286f3d (patch) | |
| tree | 535dd891a1964a8773395754a3146687222f37b3 | |
| parent | 4af82fb3886e8be25ba83a1f93da54bf0d5d7974 (diff) | |
| download | tor-4b8d2ad6f57e4e1c21b4af7f20bc7da0d3286f3d.tar.gz tor-4b8d2ad6f57e4e1c21b4af7f20bc7da0d3286f3d.zip | |
Fix compile warnings on windows
| -rw-r--r-- | changes/bug4469 | 4 | ||||
| -rw-r--r-- | src/common/util.c | 2 | ||||
| -rw-r--r-- | src/or/connection.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug4469 b/changes/bug4469 new file mode 100644 index 0000000000..e9e390ccfe --- /dev/null +++ b/changes/bug4469 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a couple of compile warnings on Windows. Fixes bug 4469; bugfix + on 0.2.3.4-alpha and 0.2.3.6-alpha. + diff --git a/src/common/util.c b/src/common/util.c index 79e09e4f59..c44a4aa3b1 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3228,6 +3228,8 @@ tor_spawn_background(const char *const filename, const char **argv, SECURITY_ATTRIBUTES saAttr; char *joined_argv; + (void)envp; // Unused on Windows + /* process_handle must not be NULL */ tor_assert(process_handle != NULL); diff --git a/src/or/connection.c b/src/or/connection.c index bf39a5cb9c..a52bf48078 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -996,6 +996,8 @@ connection_create_listener(const struct sockaddr *listensockaddr, tor_close_socket(s); goto err; } +#else + (void)options; #endif /* HAVE_SYS_UN_H */ } else { log_err(LD_BUG,"Got unexpected address family %d.", |