From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 14 Aug 2011 05:23:51 +0000 (-0700)
Subject: * process.c (Fnetwork_interface_info): Declare local only if needed.
X-Git-Tag: emacs-pretest-24.0.90~104^2~124^2~61
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a0d27fb459359d9ff04e0c08a1ac2bc6406b8b4;p=emacs.git

* process.c (Fnetwork_interface_info): Declare local only if needed.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 899ee14686d..0f77f9af8c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* process.c (Fnetwork_interface_info): Declare local only if needed.
+
 2011-08-13  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* process.c: Include ifaddrs.h and net/if_dl.h if available (Bug#8477).
diff --git a/src/process.c b/src/process.c
index b3c295cecde..9d20d0c2b09 100644
--- a/src/process.c
+++ b/src/process.c
@@ -3726,7 +3726,8 @@ FLAGS is the current flags of the interface.  */)
   Lisp_Object elt;
   int s;
   int any = 0;
-#if defined(HAVE_GETIFADDRS)
+#if (! (defined SIOCGIFHWADDR && defined HAVE_STRUCT_IFREQ_IFR_HWADDR)	\
+     && defined HAVE_GETIFADDRS && defined LLADDR)
   struct ifaddrs *ifap;
 #endif