diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-11 16:52:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-11 16:52:24 -0400 |
| commit | 64521a9d355da9f21d81c8a82056e544372685b2 (patch) | |
| tree | a3ce5b736e41db284f4ae2b5a925ac5195c77acf /src/common | |
| parent | 77e2be06f6ff9c7328144fe5df3e3bac64106449 (diff) | |
| parent | 25513ae174d80a62ca0a8dcca52683089be95ea3 (diff) | |
| download | tor-64521a9d355da9f21d81c8a82056e544372685b2.tar.gz tor-64521a9d355da9f21d81c8a82056e544372685b2.zip | |
Merge remote-tracking branch 'public/solaris_warnings_028'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/address.c | 1 | ||||
| -rw-r--r-- | src/common/crypto.h | 2 | ||||
| -rw-r--r-- | src/common/util.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/common/address.c b/src/common/address.c index 5cd7a8df67..6799dd6c56 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1603,6 +1603,7 @@ get_interface_addresses_raw,(int severity, sa_family_t family)) return result; #endif (void) severity; + (void) result; return NULL; } diff --git a/src/common/crypto.h b/src/common/crypto.h index 8f1217e2bd..2d1155e205 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -13,6 +13,8 @@ #ifndef TOR_CRYPTO_H #define TOR_CRYPTO_H +#include "orconfig.h" + #include <stdio.h> #include "torint.h" #include "testsupport.h" diff --git a/src/common/util.c b/src/common/util.c index 211ed7f8d2..259ff8756f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4702,13 +4702,13 @@ tor_get_exit_code(process_handle_t *process_handle, return PROCESS_EXIT_RUNNING; } else if (retval != process_handle->pid) { log_warn(LD_GENERAL, "waitpid() failed for PID %d: %s", - process_handle->pid, strerror(errno)); + (int)process_handle->pid, strerror(errno)); return PROCESS_EXIT_ERROR; } if (!WIFEXITED(stat_loc)) { log_warn(LD_GENERAL, "Process %d did not exit normally", - process_handle->pid); + (int)process_handle->pid); return PROCESS_EXIT_ERROR; } |