← Back to branch summary

~chasedouglas/ubuntu/maverick/xorg-server/multitouch

« back to all changes in this revision

Viewing changes to os/access.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau, Julien Cristau, Christopher James Halse Rogers
  • Date: 2010-06-07 23:22:48 UTC
  • mfrom: (0.9.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 187.
  • Revision ID: james.westby@ubuntu.com-20100607232248-x9ob0sjy8bwkc2ki
Tags: 2:1.8.1.901-1
[ Julien Cristau ]
* New upstream release
* Merge changes from 2:1.7.7-2.

[ Christopher James Halse Rogers ]
* 16-xaa-fbcomposite-fix-negative-size.diff:
  - mi hunk merged upstream.  Update to keep just the fbpict.c hunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
os/access.c
765
765
            continue;
766
766
#endif /* DNETCONN */
767
767
        len = sizeof(*(ifr->ifa_addr));
768
 
        family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr);
 
768
        family = ConvertAddr((struct sockaddr *) ifr->ifa_addr, &len,
 
769
                             (pointer *)&addr);
769
770
        if (family == -1 || family == FamilyLocal) 
770
771
            continue;
771
772
#if defined(IPv6) && defined(AF_INET6)
789
790
        }
790
791
#ifdef XDMCP
791
792
        {
792
 
            struct sockaddr broad_addr;
793
793
            /*
794
794
             * If this isn't an Internet Address, don't register it.
795
795
             */
835
835
            if ((ifr->ifa_flags & IFF_BROADCAST) &&
836
836
                (ifr->ifa_flags & IFF_UP) &&
837
837
                ifr->ifa_broadaddr)
838
 
                broad_addr = *ifr->ifa_broadaddr;
 
838
                XdmcpRegisterBroadcastAddress(
 
839
                    (struct sockaddr_in *) ifr->ifa_broadaddr);
839
840
            else
840
841
                continue;
841
 
            XdmcpRegisterBroadcastAddress((struct sockaddr_in *)
842
 
                                          &broad_addr);
843
842
        }
844
843
#endif /* XDMCP */
845
844