diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-08-17 21:46:34 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-08-17 21:46:34 +0000 |
| commit | 1f244d394354c8093ecf5a0029ae06578f74ad91 (patch) | |
| tree | 95ee3a24d04d9e7632540f44cb536845f32f7a72 /src/common/compat.h | |
| parent | f8b3927e076465808bd31e0e06712fb155ccf125 (diff) | |
| download | tor-1f244d394354c8093ecf5a0029ae06578f74ad91.tar.gz tor-1f244d394354c8093ecf5a0029ae06578f74ad91.zip | |
r14639@catbus: nickm | 2007-08-17 17:45:28 -0400
Compile without warnings on MinGW, even with --enable-gcc-warnings enabled.
svn:r11157
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 6 |
1 files changed, 3 insertions, 3 deletions
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); |