diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-08-01 15:57:34 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-08-01 15:57:34 +0000 |
| commit | 484c8b776d6d3df9e3ef474ddd85d73b2da79594 (patch) | |
| tree | dff23f7c2e4158779fa157b3e18b54572ca4120e /src/common/compat.h | |
| parent | 2872a433866620aec55344035c657a047fdcb4a3 (diff) | |
| download | tor-484c8b776d6d3df9e3ef474ddd85d73b2da79594.tar.gz tor-484c8b776d6d3df9e3ef474ddd85d73b2da79594.zip | |
r13872@Kushana: nickm | 2007-07-31 08:27:54 -0700
Rename IN4_ADDR and IN6_ADDR to try to avoid conflicting with Windows definitions. This may fix the windows build.
svn:r11011
Diffstat (limited to 'src/common/compat.h')
| -rw-r--r-- | src/common/compat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index 9b23467e73..1923e3504b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -319,8 +319,8 @@ static INLINE uint32_t IPV4IP(const tor_addr_t *a); static INLINE uint32_t IPV4IPh(const tor_addr_t *a); static INLINE uint32_t IPV4MAPh(const tor_addr_t *a); static INLINE uint16_t IN_FAMILY(const tor_addr_t *a); -static INLINE const struct in_addr *IN4_ADDR(const tor_addr_t *a); -static INLINE const struct in6_addr *IN6_ADDR(const tor_addr_t *a); +static INLINE const struct in_addr *IN4_ADDRESS(const tor_addr_t *a); +static INLINE const struct in6_addr *IN6_ADDRESS(const tor_addr_t *a); static INLINE uint16_t IN_PORT(const tor_addr_t *a); static INLINE uint32_t @@ -344,12 +344,12 @@ IN_FAMILY(const tor_addr_t *a) return a->sa.sin_family; } static INLINE const struct in_addr * -IN4_ADDR(const tor_addr_t *a) +IN4_ADDRESS(const tor_addr_t *a) { return &a->sa.sin_addr; } static INLINE const struct in6_addr * -IN6_ADDR(const tor_addr_t *a) +IN6_ADDRESS(const tor_addr_t *a) { return &a->sa6.sin6_addr; } |