Merge /home/gerhard/Develop/socat-hpux into socat-1.7.0.0

This commit is contained in:
Gerhard Rieger 2008-10-05 12:58:43 +02:00
commit 7a09331db7

View file

@ -1764,6 +1764,7 @@ int xiocheckpeer(xiosingle_t *xfd,
} }
#if HAVE_STRUCT_CMSGHDR
/* converts the ancillary message in *cmsg into a form useable for further /* converts the ancillary message in *cmsg into a form useable for further
processing. knows the specifics of common message types. processing. knows the specifics of common message types.
returns the number of resulting syntax elements is *num returns the number of resulting syntax elements is *num
@ -1840,6 +1841,7 @@ xiolog_ancillary_socket(struct cmsghdr *cmsg, int *num,
#endif /* !defined(CMSG_DATA) */ #endif /* !defined(CMSG_DATA) */
} }
#endif /* HAVE_STRUCT_CMSGHDR */
/* return the name of the interface with given index /* return the name of the interface with given index