diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-10 12:50:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-10 12:50:38 -0400 |
| commit | 5d8336c182777c36ebff561b420d67fcafb9a9f7 (patch) | |
| tree | f77e42894f28c0050540a55fea414eed5deb6691 /src/core | |
| parent | ef106ce7884b0af7adcf9f3965ebbe843a47912c (diff) | |
| download | tor-5d8336c182777c36ebff561b420d67fcafb9a9f7.tar.gz tor-5d8336c182777c36ebff561b420d67fcafb9a9f7.zip | |
Refactor ipv[46].[ch]
These are now combined into an inaddr.[ch], since their purpose is
to implement functions for struct in_addr and struct in6_addr.
The definitions for in6_addr and its allies are now in a separate
header, inaddr_st.h.
Closes ticket 26532.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/or/or.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/or/or.h b/src/core/or/or.h index 6edfd21dfb..a9bef9404a 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -49,8 +49,7 @@ #include "lib/log/util_bug.h" #include "lib/malloc/util_malloc.h" #include "lib/net/address.h" -#include "lib/net/ipv4.h" -#include "lib/net/ipv6.h" +#include "lib/net/inaddr.h" #include "lib/net/resolve.h" #include "lib/net/socket.h" #include "lib/string/compat_ctype.h" |