diff options
| author | Paul Eggert | 2011-08-13 22:23:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-08-13 22:23:51 -0700 |
| commit | 0a0d27fb459359d9ff04e0c08a1ac2bc6406b8b4 (patch) | |
| tree | 62d6fe611d767b34eec37c2dd6113a8d69ea1bc4 /src | |
| parent | 358e1dd2b2e984069dc761ee4266efdad33a213f (diff) | |
| download | emacs-0a0d27fb459359d9ff04e0c08a1ac2bc6406b8b4.tar.gz emacs-0a0d27fb459359d9ff04e0c08a1ac2bc6406b8b4.zip | |
* process.c (Fnetwork_interface_info): Declare local only if needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/process.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 899ee14686d..0f77f9af8c1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-08-14 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * process.c (Fnetwork_interface_info): Declare local only if needed. | ||
| 4 | |||
| 1 | 2011-08-13 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2011-08-13 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * process.c: Include ifaddrs.h and net/if_dl.h if available (Bug#8477). | 7 | * 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. */) | |||
| 3726 | Lisp_Object elt; | 3726 | Lisp_Object elt; |
| 3727 | int s; | 3727 | int s; |
| 3728 | int any = 0; | 3728 | int any = 0; |
| 3729 | #if defined(HAVE_GETIFADDRS) | 3729 | #if (! (defined SIOCGIFHWADDR && defined HAVE_STRUCT_IFREQ_IFR_HWADDR) \ |
| 3730 | && defined HAVE_GETIFADDRS && defined LLADDR) | ||
| 3730 | struct ifaddrs *ifap; | 3731 | struct ifaddrs *ifap; |
| 3731 | #endif | 3732 | #endif |
| 3732 | 3733 | ||