diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 21:35:12 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-17 21:35:12 +0200 |
commit | f46efb4476d4cb7401ea73e4c452d9460bdd0f33 (patch) | |
tree | 7322dc983c668ea995631a4697d489a33db429e0 /mysys | |
parent | 038cd5195612084542704f181695358e3b8959a8 (diff) | |
parent | d5332086d7aa1eaef9da5850d38dd1489fad7032 (diff) | |
download | mariadb-git-f46efb4476d4cb7401ea73e4c452d9460bdd0f33.tar.gz |
Merge 10.7 into 10.8
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 |