diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compat.c | 2 | ||||
| -rw-r--r-- | src/common/compat.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index ebddce74b1..fa7b8c2b3d 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1671,7 +1671,7 @@ tor_cond_new(void) } /** Release all resources held by <b>cond</b>. */ void -tor_conf_free(tor_cond_t *cond) +tor_cond_free(tor_cond_t *cond) { tor_assert(cond); if (pthread_cond_destroy(&cond->cond)) { diff --git a/src/common/compat.h b/src/common/compat.h index 647e64c4b7..6cf006bb3c 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -301,8 +301,8 @@ typedef uint16_t sa_family_t; #ifndef _MSC_VER /* Apparently, MSVC doesn't define s6_addr16 or s6_addr32. How dumb. */ /* XXXX020 detect with autoconf. */ -#define S6_ADDR16(x) ((x).s6_addr16) -#define S6_ADDR32(x) ((x).s6_addr32) +#define S6_ADDR16(x) ((uint16_t*)(x).s6_addr16) +#define S6_ADDR32(x) ((uint32_t*)(x).s6_addr32) #else #define S6_ADDR16(x) ((uint16_t*)((char*)&(x).s6_addr)) #define S6_ADDR32(x) ((uint32_t*)((char*)&(x).s6_addr)) @@ -481,7 +481,7 @@ unsigned long tor_get_thread_id(void); #ifdef TOR_IS_MULTITHREADED typedef struct tor_cond_t tor_cond_t; tor_cond_t *tor_cond_new(void); -void tor_conf_free(tor_cond_t *cond); +void tor_cond_free(tor_cond_t *cond); int tor_cond_wait(tor_cond_t *cond, tor_mutex_t *mutex); void tor_cond_signal_one(tor_cond_t *cond); void tor_cond_signal_all(tor_cond_t *cond); |