diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-14 15:44:55 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-14 15:44:55 +0200 |
commit | ae6ebafd819d48c965d2615fc78f1f950e0fbf40 (patch) | |
tree | 6a60f0bfd7ca8eaad06febe4a5faf7a45451d4b2 /mysys | |
parent | c82f3f1b041b877ac0a149e594756a61d1f6ef48 (diff) | |
parent | dc2741be52913f12f17e04341f17c51875aa5065 (diff) | |
download | mariadb-git-ae6ebafd819d48c965d2615fc78f1f950e0fbf40.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/my_gethwaddr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index 24054aa4151..1f344af88fd 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -116,7 +116,7 @@ my_bool my_gethwaddr(uchar *to) uint i; for (i= 0; res && i < ifc.ifc_len / sizeof(ifr[0]); i++) { -#if !defined(_AIX) || !defined(__linux__) +#if defined(_AIX) || defined(__linux__) #if defined(__linux__) #define HWADDR_DATA ifr[i].ifr_hwaddr.sa_data #else |