From 2026418cf3f153c6f94884eacf6eabda31141ca9 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Thu, 12 Jan 2006 08:16:12 +0000 Subject: [PATCH] [HAVE_INTTYPES_H]: Include inttypes.h. (ifflag_table): Fix typo (IFF_OACTIV -> IFF_OACTIVE). (Fnetwork_interface_info): Use HAVE_STRUCT_IFREQ_IFR_NETMASK macro. Also try member ifr_addr when getting netmask. --- src/ChangeLog | 12 ++++++++++++ src/process.c | 13 ++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e722bf7894..aa3c0f4e96 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2006-01-12 YAMAMOTO Mitsuharu + + * macterm.c [USE_ATSUI] (atsu_get_text_layout_with_text_ptr) + [MAC_OS_X_VERSION_MAX_ALLOWED >= 1020]: Specify kATSLineUseQDRendering. + (XLoadQueryFont) [USE_ATSUI]: Display diacritical marks in + decomposed form. + + * process.c [HAVE_INTTYPES_H]: Include inttypes.h. + (ifflag_table): Fix typo (IFF_OACTIV -> IFF_OACTIVE). + (Fnetwork_interface_info): Use HAVE_STRUCT_IFREQ_IFR_NETMASK + macro. Also try member ifr_addr when getting netmask. + 2006-01-10 Stefan Monnier * fileio.c (Fexpand_file_name): Remove redundant tests. diff --git a/src/process.c b/src/process.c index 526e351839..ffb1cd664e 100644 --- a/src/process.c +++ b/src/process.c @@ -40,6 +40,9 @@ Boston, MA 02110-1301, USA. */ #include /* some typedefs are used in sys/file.h */ #include #include +#ifdef HAVE_INTTYPES_H +#include +#endif #ifdef HAVE_UNISTD_H #include #endif @@ -3596,8 +3599,8 @@ static struct ifflag_def ifflag_table[] = { #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 */ @@ -3683,11 +3686,15 @@ FLAGS is the current flags of the interface. */) 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); -- 2.20.1