diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 09:19:32 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 09:19:32 +0200 |
commit | d5332086d7aa1eaef9da5850d38dd1489fad7032 (patch) | |
tree | bd65941f8399f6f215d3bfb930d2fc2a44416cea /mysys | |
parent | 0e6f2757d11502d74d21e4a75fa5247fc3334024 (diff) | |
parent | 9aea7d83c8d006519bdf1f3269136b3756ed7548 (diff) | |
download | mariadb-git-d5332086d7aa1eaef9da5850d38dd1489fad7032.tar.gz |
Merge 10.6 into 10.7
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 |