diff options
| author | Narayan Kamath <narayan@google.com> | 2017-09-13 12:53:52 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2017-09-13 14:18:03 +0100 |
| commit | fc74cb45eafe51162b10a850016c6d2e1f8fd23c (patch) | |
| tree | 203fb0f2feed47099e5bf999bcaff954f5c0e49d /ipv6-internal.h | |
| parent | 9dfd4017adef7eaf179f743bf746254917a4fb74 (diff) | |
| download | libevent-fc74cb45eafe51162b10a850016c6d2e1f8fd23c.tar.gz | |
Revert "Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?""
This reverts commit 83a0c9c65a60a92d3ea5542596b3ba56db492c37.
Bug: 64543673
Test: make checkbuild
Test: Manual tombstoned test
Change-Id: I84bb128d1dec433195f2cbdbf70236ba17fa9955
Diffstat (limited to 'ipv6-internal.h')
| -rw-r--r-- | ipv6-internal.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ipv6-internal.h b/ipv6-internal.h index e373711..0c20737 100644 --- a/ipv6-internal.h +++ b/ipv6-internal.h @@ -27,14 +27,16 @@ /* Internal use only: Fake IPv6 structures and values on platforms that * do not have them */ -#ifndef _EVENT_IPV6_INTERNAL_H -#define _EVENT_IPV6_INTERNAL_H +#ifndef IPV6_INTERNAL_H_INCLUDED_ +#define IPV6_INTERNAL_H_INCLUDED_ + +#include "event2/event-config.h" +#include "evconfig-private.h" #include <sys/types.h> -#ifdef _EVENT_HAVE_SYS_SOCKET_H +#ifdef EVENT__HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif -#include "event2/event-config.h" #include "event2/util.h" #ifdef __cplusplus @@ -47,17 +49,17 @@ extern "C" { * properly. */ -#ifndef _EVENT_HAVE_STRUCT_IN6_ADDR +#ifndef EVENT__HAVE_STRUCT_IN6_ADDR struct in6_addr { ev_uint8_t s6_addr[16]; }; #endif -#ifndef _EVENT_HAVE_SA_FAMILY_T +#ifndef EVENT__HAVE_SA_FAMILY_T typedef int sa_family_t; #endif -#ifndef _EVENT_HAVE_STRUCT_SOCKADDR_IN6 +#ifndef EVENT__HAVE_STRUCT_SOCKADDR_IN6 struct sockaddr_in6 { /* This will fail if we find a struct sockaddr that doesn't have * sa_family as the first element. */ |