[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/process.c
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/process.c |
Date: |
Wed, 17 Sep 2003 17:31:53 -0400 |
Index: emacs/src/process.c
diff -c emacs/src/process.c:1.411 emacs/src/process.c:1.412
*** emacs/src/process.c:1.411 Tue Sep 16 19:05:24 2003
--- emacs/src/process.c Wed Sep 17 17:31:53 2003
***************
*** 3336,3342 ****
#endif /* HAVE_SOCKETS */
! #ifdef HAVE_SOCKETS
#ifdef SIOCGIFCONF
DEFUN ("network-interface-list", Fnetwork_interface_list,
Snetwork_interface_list, 0, 0, 0,
--- 3336,3342 ----
#endif /* HAVE_SOCKETS */
! #if defined(HAVE_SOCKETS) && defined(HAVE_NET_IF_H) &&
defined(HAVE_SYS_IOCTL_H)
#ifdef SIOCGIFCONF
DEFUN ("network-interface-list", Fnetwork_interface_list,
Snetwork_interface_list, 0, 0, 0,
***************
*** 3397,3403 ****
return res;
}
! #endif
#if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS)
--- 3397,3403 ----
return res;
}
! #endif /* SIOCGIFCONF */
#if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS)
***************
*** 3483,3489 ****
return Qnil;
elt = Qnil;
! #ifdef SIOCGIFFLAGS
if (ioctl (s, SIOCGIFFLAGS, &rq) == 0)
{
int flags = rq.ifr_flags;
--- 3483,3489 ----
return Qnil;
elt = Qnil;
! #if defined(SIOCGIFFLAGS) && defined(ifr_flags)
if (ioctl (s, SIOCGIFFLAGS, &rq) == 0)
{
int flags = rq.ifr_flags;
***************
*** 3511,3520 ****
res = Fcons (elt, res);
elt = Qnil;
! #ifdef SIOCGIFHWADDR
if (ioctl (s, SIOCGIFHWADDR, &rq) == 0)
{
! Lisp_Object hwaddr = Fmake_vector (6, Qnil);
register struct Lisp_Vector *p = XVECTOR (hwaddr);
int n;
--- 3511,3520 ----
res = Fcons (elt, res);
elt = Qnil;
! #if defined(SIOCGIFHWADDR) && defined(ifr_hwaddr)
if (ioctl (s, SIOCGIFHWADDR, &rq) == 0)
{
! Lisp_Object hwaddr = Fmake_vector (make_number (6), Qnil);
register struct Lisp_Vector *p = XVECTOR (hwaddr);
int n;
***************
*** 3527,3533 ****
res = Fcons (elt, res);
elt = Qnil;
! #ifdef SIOCGIFNETMASK
if (ioctl (s, SIOCGIFNETMASK, &rq) == 0)
{
any++;
--- 3527,3533 ----
res = Fcons (elt, res);
elt = Qnil;
! #if defined(SIOCGIFNETMASK) && defined(ifr_netmask)
if (ioctl (s, SIOCGIFNETMASK, &rq) == 0)
{
any++;
***************
*** 3537,3543 ****
res = Fcons (elt, res);
elt = Qnil;
! #ifdef SIOCGIFBRDADDR
if (ioctl (s, SIOCGIFBRDADDR, &rq) == 0)
{
any++;
--- 3537,3543 ----
res = Fcons (elt, res);
elt = Qnil;
! #if defined(SIOCGIFBRDADDR) && defined(ifr_broadaddr)
if (ioctl (s, SIOCGIFBRDADDR, &rq) == 0)
{
any++;
***************
*** 3547,3553 ****
res = Fcons (elt, res);
elt = Qnil;
! #ifdef SIOCGIFADDR
if (ioctl (s, SIOCGIFADDR, &rq) == 0)
{
any++;
--- 3547,3553 ----
res = Fcons (elt, res);
elt = Qnil;
! #if defined(SIOCGIFADDR) && defined(ifr_addr)
if (ioctl (s, SIOCGIFADDR, &rq) == 0)
{
any++;
***************
*** 6656,6668 ****
defsubr (&Sset_network_process_option);
defsubr (&Smake_network_process);
defsubr (&Sformat_network_address);
#ifdef SIOCGIFCONF
defsubr (&Snetwork_interface_list);
#endif
#if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS)
defsubr (&Snetwork_interface_info);
#endif
! #endif /* HAVE_SOCKETS */
#ifdef DATAGRAM_SOCKETS
defsubr (&Sprocess_datagram_address);
defsubr (&Sset_process_datagram_address);
--- 6656,6670 ----
defsubr (&Sset_network_process_option);
defsubr (&Smake_network_process);
defsubr (&Sformat_network_address);
+ #endif /* HAVE_SOCKETS */
+ #if defined(HAVE_SOCKETS) && defined(HAVE_NET_IF_H) &&
defined(HAVE_SYS_IOCTL_H)
#ifdef SIOCGIFCONF
defsubr (&Snetwork_interface_list);
#endif
#if defined(SIOCGIFADDR) || defined(SIOCGIFHWADDR) || defined(SIOCGIFFLAGS)
defsubr (&Snetwork_interface_info);
#endif
! #endif /* HAVE_SOCKETS ... */
#ifdef DATAGRAM_SOCKETS
defsubr (&Sprocess_datagram_address);
defsubr (&Sset_process_datagram_address);
- [Emacs-diffs] Changes to emacs/src/process.c, Miles Bader, 2003/09/01
- [Emacs-diffs] Changes to emacs/src/process.c, Kim F. Storm, 2003/09/13
- [Emacs-diffs] Changes to emacs/src/process.c, Kim F. Storm, 2003/09/16
- [Emacs-diffs] Changes to emacs/src/process.c,
Kim F. Storm <=
- [Emacs-diffs] Changes to emacs/src/process.c, Dave Love, 2003/09/18
- [Emacs-diffs] Changes to emacs/src/process.c, Dave Love, 2003/09/23
- [Emacs-diffs] Changes to emacs/src/process.c, Kim F. Storm, 2003/09/23
- [Emacs-diffs] Changes to emacs/src/process.c, Kenichi Handa, 2003/09/26