diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 16:04:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 16:04:01 +0200 |
| commit | 93b4f84ab25bd2f79e024f339cf06fe2bd99d586 (patch) | |
| tree | 06fa007c99f039067fab2d2f00607b8f416181cf /mysys | |
| parent | 1e8189fceed795a16d31f484f844b7a4a048b920 (diff) | |
| parent | 2ef2e2322a03b6decf4ad00721a27e6dc308847f (diff) | |
| download | mariadb-git-93b4f84ab25bd2f79e024f339cf06fe2bd99d586.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_addr_resolve.c | 2 | ||||
| -rw-r--r-- | mysys/my_gethwaddr.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mysys/my_addr_resolve.c b/mysys/my_addr_resolve.c index f0c0d214171..ac1bdae187c 100644 --- a/mysys/my_addr_resolve.c +++ b/mysys/my_addr_resolve.c @@ -202,7 +202,7 @@ int start_addr2line_fork(const char *binary_path) close(out[0]); close(out[1]); execlp("addr2line", "addr2line", "-C", "-f", "-e", binary_path, NULL); - exit(1); + _exit(1); } close(in[0]); diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index 70e1d549e15..5bb0ed75fb3 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -33,8 +33,14 @@ static my_bool memcpy_and_test(uchar *to, uchar *from, uint len) return res; } -#if defined(__APPLE__) || defined(__FreeBSD__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#ifdef __OpenBSD__ +#include <netinet/in.h> +#include <net/if_arp.h> +#include <netinet/if_ether.h> +#else #include <net/ethernet.h> +#endif #include <sys/sysctl.h> #include <net/route.h> #include <net/if.h> |