Skip to content

libs: fix visual studio Compiler Error C2036 #9818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Jul 13, 2023
Merged

libs: fix visual studio Compiler Error C2036 #9818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/nuttx/net/netfilter/ip_tables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ struct ipt_get_entries
static inline FAR struct xt_entry_target *
ipt_get_target(FAR struct ipt_entry *e)
{
return (FAR void *)e + e->target_offset;
return (FAR char *)e + e->target_offset;
}

#endif /* __INCLUDE_NUTTX_NET_NETFILTER_IP_TABLES_H */
6 changes: 3 additions & 3 deletions mm/mempool/mempool_multiple.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,13 @@ mempool_multiple_alloc_chunk(FAR struct mempool_multiple_s *mpool,
}

ret = (FAR void *)ALIGN_UP(chunk->next, align);
if (chunk->end - ret < size)
if ((uintptr_t)chunk->end - (uintptr_t)ret < size)
{
goto retry;
}

chunk->used++;
chunk->next = ret + size;
chunk->next = (FAR char *)ret + size;
return ret;
}

Expand Down Expand Up @@ -738,7 +738,7 @@ mempool_multiple_mallinfo(FAR struct mempool_multiple_s *mpool)
FAR struct mpool_chunk_s *chunk;

chunk = (FAR struct mpool_chunk_s *)sq_peek(&mpool->chunk_queue);
info.fordblks += chunk->end - chunk->next;
info.fordblks += (uintptr_t)chunk->end - (uintptr_t)chunk->next;
}

nxmutex_unlock(&mpool->lock);
Expand Down