diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-26 11:33:38 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-26 11:33:38 +0000 |
| commit | b86e1f46aba4d9f348e4295ea7c652b600adfa8f (patch) | |
| tree | e5945fac7a7dec1709375bd4897ba4dafd2de923 /package/libnl-tiny/src/include/netlink/attr.h | |
| parent | 5e1086da2dea492398407519d31310f5fb61880a (diff) | |
libnl-tiny: Fix for c++ compatibility
g++ compiler issued some errors like "invalid conversion from void* to *struct nl_attr"
when compiling cpp file which calls libnl-tiny functions. (it's OK with gcc)
Also see https://dev.openwrt.org/ticket/7854
Patch from: kentarou matsuyama <matsuyama@thinktube.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25101 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libnl-tiny/src/include/netlink/attr.h')
| -rw-r--r-- | package/libnl-tiny/src/include/netlink/attr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/libnl-tiny/src/include/netlink/attr.h b/package/libnl-tiny/src/include/netlink/attr.h index 7076d67e2..3b56a82dc 100644 --- a/package/libnl-tiny/src/include/netlink/attr.h +++ b/package/libnl-tiny/src/include/netlink/attr.h @@ -508,7 +508,7 @@ static inline int nla_nest_end(struct nl_msg *msg, struct nlattr *start) static inline int nla_parse_nested(struct nlattr *tb[], int maxtype, struct nlattr *nla, struct nla_policy *policy) { - return nla_parse(tb, maxtype, nla_data(nla), nla_len(nla), policy); + return nla_parse(tb, maxtype, (struct nlattr *)nla_data(nla), nla_len(nla), policy); } /** @@ -563,8 +563,8 @@ static inline int nla_strcmp(const struct nlattr *nla, const char *str) */ static inline size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize) { - size_t srclen = nla_len(nla); - char *src = nla_data(nla); + size_t srclen = (size_t)nla_len(nla); + char *src = (char*)nla_data(nla); if (srclen > 0 && src[srclen - 1] == '\0') srclen--; @@ -713,7 +713,7 @@ static inline size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dst * @arg rem initialized to len, holds bytes currently remaining in stream */ #define nla_for_each_nested(pos, nla, rem) \ - for (pos = nla_data(nla), rem = nla_len(nla); \ + for (pos = (struct nlattr *)nla_data(nla), rem = nla_len(nla); \ nla_ok(pos, rem); \ pos = nla_next(pos, &(rem))) |