From 3aa40ffa6f0210b484d91bc54e541bb99fac8b78 Mon Sep 17 00:00:00 2001 From: "joerg@trift2." <> Date: Thu, 9 Aug 2007 14:56:57 +0200 Subject: [PATCH] mysys/my_gethwaddr.c Fix a typing error in a conditional compiling directive (reported by Vasil Dimov: Thanks !), and improve their nesting ("MAIN" independent of platform). --- mysys/my_gethwaddr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index 845b5aa4152..c7f138c7337 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -19,7 +19,9 @@ #include "mysys_priv.h" #include -#if !defined(__FreeBSD__) || defined(__linux__) +#ifndef MAIN + +#if defined(__FreeBSD__) || defined(__linux__) static my_bool memcpy_and_test(uchar *to, uchar *from, uint len) { uint i, res=1; @@ -29,6 +31,7 @@ static my_bool memcpy_and_test(uchar *to, uchar *from, uint len) res=0; return res; } +#endif /* FreeBSD || linux */ #ifdef __FreeBSD__ @@ -98,7 +101,7 @@ err: return res; } -#else +#else /* FreeBSD elif linux */ /* just fail */ my_bool my_gethwaddr(uchar *to __attribute__((unused))) {