Mercurial > emacs
diff src/process.c @ 83456:de425e4eb0bc
Merged from miles@gnu.org--gnu-2005 (patch 182-184, 691-699)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-691
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-692
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-693
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-694
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-695
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-696
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-697
Checkout man/cc-mode.texi from CVS with RCS keywords disabled
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-698
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-699
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-182
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-183
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-184
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-496
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 17 Jan 2006 00:56:42 +0000 |
| parents | 845a93c68e9a e5c85a134e67 |
| children | b98066f4aa10 |
line wrap: on
line diff
--- a/src/process.c Thu Jan 12 11:20:02 2006 +0000 +++ b/src/process.c Tue Jan 17 00:56:42 2006 +0000 @@ -40,6 +40,9 @@ #include <sys/types.h> /* some typedefs are used in sys/file.h */ #include <sys/file.h> #include <sys/stat.h> +#ifdef HAVE_INTTYPES_H +#include <inttypes.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -3601,8 +3604,8 @@ #ifdef IFF_DYNAMIC { IFF_DYNAMIC, "dynamic" }, #endif -#ifdef IFF_OACTIV - { IFF_OACTIV, "oactiv" }, /* OpenBSD: transmission in progress */ +#ifdef IFF_OACTIVE + { IFF_OACTIVE, "oactive" }, /* OpenBSD: transmission in progress */ #endif #ifdef IFF_SIMPLEX { IFF_SIMPLEX, "simplex" }, /* OpenBSD: can't hear own transmissions */ @@ -3688,11 +3691,15 @@ res = Fcons (elt, res); elt = Qnil; -#if defined(SIOCGIFNETMASK) && defined(ifr_netmask) +#if defined(SIOCGIFNETMASK) && (defined(HAVE_STRUCT_IFREQ_IFR_NETMASK) || defined(HAVE_STRUCT_IFREQ_IFR_ADDR)) if (ioctl (s, SIOCGIFNETMASK, &rq) == 0) { any++; +#ifdef HAVE_STRUCT_IFREQ_IFR_NETMASK elt = conv_sockaddr_to_lisp (&rq.ifr_netmask, sizeof (rq.ifr_netmask)); +#else + elt = conv_sockaddr_to_lisp (&rq.ifr_addr, sizeof (rq.ifr_addr)); +#endif } #endif res = Fcons (elt, res);