Re: process.c failure

[Dave Love]

address@hidden (Kim F. Storm) writes:

> I will do that eventually ... I just didn't have time to go through
> that when you reported that process.c didn't compile on several systems.

This should do it unless net/if.h has prerequisite headers on any
systems.

2003-09-22  Dave Love  <address@hidden>

        * configure.in: Check members of struct ifreq.

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.355
diff -u -p -c -r1.355 configure.in
cvs server: conflicting specifications of output style
*** configure.in        13 Sep 2003 23:28:18 -0000      1.355
--- configure.in        22 Sep 2003 18:10:43 -0000
*************** AC_CHECK_MEMBER(struct tm.tm_gmtoff,
*** 1514,1519 ****
--- 1514,1522 ----
                [AC_DEFINE(HAVE_TM_GMTOFF, 1,
                           [Define to 1 if `tm_gmtoff' is member of `struct 
tm'.])],,
                [#include <time.h>])
+ AC_CHECK_MEMBERS([struct ifreq.ifr_flags, struct ifreq.ifr_hwaddr, 
+                 struct ifreq.ifr_netmask, struct ifreq.ifr_broadaddr,
+                 struct ifreq.ifr_addr], , ,[#include <net/if.h>])
  
  dnl checks for compiler characteristics
  

2003-09-22  Dave Love  <address@hidden>

        * process.c (Fnetwork_interface_info): Use
        HAVE_STRUCT_IFREQ... macros.

*** process.c.~1.413.~  Thu Sep 18 11:32:01 2003
--- process.c   Mon Sep 22 14:06:06 2003
***************
*** 3483,3489 ****
      return Qnil;
  
    elt = Qnil;
! #if defined(SIOCGIFFLAGS) && defined(ifr_flags)
    if (ioctl (s, SIOCGIFFLAGS, &rq) == 0)
      {
        int flags = rq.ifr_flags;
--- 3483,3489 ----
      return Qnil;
  
    elt = Qnil;
! #if defined(SIOCGIFFLAGS) && defined(HAVE_STRUCT_IFREQ_IFR_FLAGS)
    if (ioctl (s, SIOCGIFFLAGS, &rq) == 0)
      {
        int flags = rq.ifr_flags;
***************
*** 3511,3517 ****
    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);
--- 3511,3517 ----
    res = Fcons (elt, res);
  
    elt = Qnil;
! #if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ_IFR_HWADDR)
    if (ioctl (s, SIOCGIFHWADDR, &rq) == 0)
      {
        Lisp_Object hwaddr = Fmake_vector (make_number (6), Qnil);
***************
*** 3537,3543 ****
    res = Fcons (elt, res);
  
    elt = Qnil;
! #if defined(SIOCGIFBRDADDR) && defined(ifr_broadaddr)
    if (ioctl (s, SIOCGIFBRDADDR, &rq) == 0)
      {
        any++;
--- 3537,3543 ----
    res = Fcons (elt, res);
  
    elt = Qnil;
! #if defined(SIOCGIFBRDADDR) && defined(HAVE_STRUCT_IFREQ_IFR_BROADADDR)
    if (ioctl (s, SIOCGIFBRDADDR, &rq) == 0)
      {
        any++;
***************
*** 3547,3553 ****
    res = Fcons (elt, res);
  
    elt = Qnil;
! #if defined(SIOCGIFADDR) && defined(ifr_addr)
    if (ioctl (s, SIOCGIFADDR, &rq) == 0)
      {
        any++;
--- 3547,3553 ----
    res = Fcons (elt, res);
  
    elt = Qnil;
! #if defined(SIOCGIFADDR) && defined(HAVE_STRUCT_IFREQ_IFR_ADDR)
    if (ioctl (s, SIOCGIFADDR, &rq) == 0)
      {
        any++;