diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2009-09-01 05:23:47 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2009-09-01 18:36:27 +0200 |
| commit | aea9cf1011cf3c7badfd1bc49f0a27f96f234cf9 (patch) | |
| tree | c66af3fe76725d159afe4f32e421c3c6a8db349c /src/or/config.c | |
| parent | 075c004095e25940707aa496b49e29caefdd73e8 (diff) | |
| download | tor-aea9cf1011cf3c7badfd1bc49f0a27f96f234cf9.tar.gz tor-aea9cf1011cf3c7badfd1bc49f0a27f96f234cf9.zip | |
Fix compile warnings on Snow Leopard
Big thanks to nickm and arma for helping me with this!
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 84146c1063..8fd70bec9f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2504,7 +2504,8 @@ is_local_addr(const tor_addr_t *addr) * the same /24 as last_resolved_addr will be the same as checking whether * it was on net 0, which is already done by is_internal_IP. */ - if ((last_resolved_addr & 0xffffff00ul) == (ip & 0xffffff00ul)) + if ((last_resolved_addr & (uint32_t)0xffffff00ul) + == (ip & (uint32_t)0xffffff00ul)) return 1; } return 0; @@ -4187,7 +4188,7 @@ options_init_from_string(const char *cf, err: config_free(&options_format, newoptions); if (*msg) { - int len = strlen(*msg)+256; + int len = (int)strlen(*msg)+256; char *newmsg = tor_malloc(len); tor_snprintf(newmsg, len, "Failed to parse/validate config: %s", *msg); |