summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-11-21 10:25:38 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-11-21 10:25:38 +0200
commitb35a048ece4f5dd7c6757d86a303f27187a16117 (patch)
tree707189e5b00169b61b9ec13608625b938bd4f35b /mysys
parent91a7e9eb1ef9bfba6a1da5bca4a9b8c58a94c245 (diff)
parent5b1eb87b6fc9cd09d5a0ffcd926203700e035689 (diff)
downloadmariadb-git-b35a048ece4f5dd7c6757d86a303f27187a16117.tar.gz
Merge 10.8 into 10.9
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_gethwaddr.c2
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