← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/squid3/oneiric-security

« back to all changes in this revision

Viewing changes to include/getaddrinfo.h

  • Committer: Bazaar Package Importer
  • Author(s): Mahyuddin Susanto
  • Date: 2011-02-15 18:46:13 UTC
  • mfrom: (21.2.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110215184613-1u3dh5sz4i055flk
Tags: 3.1.10-1ubuntu1
https://launchpad.net/bugs/719283
* Merge from debian unstable. (LP: #719283)  Remaining changes:
  - debian/patches/18-fix-ftbfs-binutils-gold.dpatch: Add library linker into
    LIBS instead to LDFLAGS to fixing FTBFS binutils-gold.
* Drop Ubuntu configuration for ufw which landed in Debian and sync it: 
  - debian/squid3.ufw.profile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/getaddrinfo.h
62
62
    int ai_family;              /* PF_xxx */
63
63
    int ai_socktype;            /* SOCK_xxx */
64
64
    int ai_protocol;            /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
65
 
    size_t ai_addrlen;          /* length of ai_addr */
 
65
    socklen_t ai_addrlen;       /* length of ai_addr */
66
66
    char *ai_canonname;         /* canonical name for nodename */
67
67
    struct sockaddr *ai_addr;   /* binary address */
68
68
    struct addrinfo *ai_next;   /* next structure in linked list */