diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-11-05 21:06:25 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-11-05 21:06:25 +0000 |
| commit | aa05fde22d24eebbf581cc3fa9e2e49ea6f93eb3 (patch) | |
| tree | 86d871c674e17f96b6d1e38009572f44fad3a4c6 /include | |
| parent | aff0faf6ba69fb2dcd29034bb481deceffbe663a (diff) | |
netsock2: Define AST_AF_* enum constants to their AF_* equivalents
This patch explicitly defines AST_AF_* enum constants to their sys/socket.h
defined equivalents. It is certainly unclear why these constants actually have
to exist, given that netsock2.h includes sys/socket.h; however, since the code
base is already liberally sprinkled with the usage of AST_AF_* (as well as with
direct calls to AF_*), this will at least keep the semantics consistent between
their usage across systems.
........
Merged revisions 402503 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/acl.h | 2 | ||||
| -rw-r--r-- | include/asterisk/netsock2.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h index 89eff7857..a0f06df57 100644 --- a/include/asterisk/acl.h +++ b/include/asterisk/acl.h @@ -208,7 +208,7 @@ enum ast_acl_sense ast_apply_acl(struct ast_acl_list *acl_list, const struct ast * * \param addr The IP address found. The address family is used * as an input parameter to filter the returned addresses. If - * it is 0, both IPv4 and IPv6 addresses can be returned. + * it is AST_AF_UNSPEC, both IPv4 and IPv6 addresses can be returned. * \param hostname The hostname to look up * * \retval 0 Success diff --git a/include/asterisk/netsock2.h b/include/asterisk/netsock2.h index 90122f6c0..b4513c604 100644 --- a/include/asterisk/netsock2.h +++ b/include/asterisk/netsock2.h @@ -37,9 +37,9 @@ extern "C" { * ever include socket.h. */ enum { - AST_AF_UNSPEC = 0, - AST_AF_INET = 2, - AST_AF_INET6 = 10, + AST_AF_UNSPEC = AF_UNSPEC, + AST_AF_INET = AF_INET, + AST_AF_INET6 = AF_INET6, }; enum ast_transport { |