diff options
| author | Ben Fuhrmannek | 2019-06-19 11:04:17 +0200 |
|---|---|---|
| committer | Ben Fuhrmannek | 2019-06-19 11:04:17 +0200 |
| commit | 3ab467100883adedab71a28e1699799e45ab0b2d (patch) | |
| tree | 87ca7d7d462f138982ae578b3031c0e2425f68dd /src/sp_network_utils.c | |
| parent | db20c8ddf4d5c068e20bbce1f6d283c9eb06119a (diff) | |
fix snufflepagus_globals linking issues and one mac compatibility issue
Diffstat (limited to 'src/sp_network_utils.c')
| -rw-r--r-- | src/sp_network_utils.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/sp_network_utils.c b/src/sp_network_utils.c index c444c1e..1811d98 100644 --- a/src/sp_network_utils.c +++ b/src/sp_network_utils.c | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | #include "php_snuffleupagus.h" | 1 | #include "php_snuffleupagus.h" |
| 2 | 2 | ||
| 3 | ZEND_DECLARE_MODULE_GLOBALS(snuffleupagus) | ||
| 4 | |||
| 5 | static inline bool cidr4_match(const struct in_addr addr, | 3 | static inline bool cidr4_match(const struct in_addr addr, |
| 6 | const struct in_addr net, uint8_t bits); | 4 | const struct in_addr net, uint8_t bits); |
| 7 | static inline bool cidr6_match(const struct in6_addr address, | 5 | static inline bool cidr6_match(const struct in6_addr address, |
| @@ -19,7 +17,7 @@ static inline bool cidr4_match(const struct in_addr addr, | |||
| 19 | 17 | ||
| 20 | static inline bool cidr6_match(const struct in6_addr address, | 18 | static inline bool cidr6_match(const struct in6_addr address, |
| 21 | const struct in6_addr network, uint8_t bits) { | 19 | const struct in6_addr network, uint8_t bits) { |
| 22 | #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) | 20 | #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) |
| 23 | const uint32_t *a = address.__u6_addr.__u6_addr32; | 21 | const uint32_t *a = address.__u6_addr.__u6_addr32; |
| 24 | const uint32_t *n = network.__u6_addr.__u6_addr32; | 22 | const uint32_t *n = network.__u6_addr.__u6_addr32; |
| 25 | #else | 23 | #else |
