bk commit into 4.1 tree (jww:1.2194)

[jwythe]

Below is the list of changes that have just been committed into a local
4.1 repository of jww. When jww does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2194 05/10/31 21:11:04 jww@stripped +1 -0
  my_gethwaddr.c:
    Handle compiling when system doesn't have net/ethernet.h.

  mysys/my_gethwaddr.c
    1.3 05/10/31 09:51:24 jww@stripped +9 -1
    Handle compiling when system doesn't have net/ethernet.h.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jww
# Host:	lnxdev.silk.ca
# Root:	/usr/src/mysql/mysql-4.1

--- 1.2/mysys/my_gethwaddr.c	Tue Oct 19 15:28:34 2004
+++ 1.3/mysys/my_gethwaddr.c	Mon Oct 31 09:51:24 2005
@@ -21,6 +21,8 @@
 #include <m_string.h>
 
 #ifndef MAIN
+#if HAVE_NET_ETHERNET_H
+
 static my_bool memcpy_and_test(uchar *to, uchar *from, uint len)
 {
   uint i, res=1;
@@ -33,6 +35,7 @@
 
 #ifdef __FreeBSD__
 
+#define GETHWADDR 1
 #include <net/ethernet.h>
 #include <sys/sysctl.h>
 #include <net/route.h>
@@ -73,6 +76,7 @@
 
 #elif __linux__
 
+#define GETHWADDR 1
 #include <net/if.h>
 #include <sys/ioctl.h>
 #include <net/ethernet.h>
@@ -99,7 +103,11 @@
   return res;
 }
 
-#else
+#endif
+#endif /* HAVE_NET_ETHERNET_H */
+
+#ifndef GETHWADDR
+
 /* just fail */
 my_bool my_gethwaddr(uchar *to __attribute__((unused)))
 {