Skip to content
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

Jump to bottom

Fix some errors, when using with C++ #380

Closed
wants to merge 1 commit into from
Closed

Fix some errors, when using with C++ #380

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
9 changes: 4 additions & 5 deletions include/base/nl-base-utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,7 @@ static inline bool _nl_memeq(const void *s1, const void *s2, size_t len)
return _nl_memcmp(s1, s2, len) == 0;
}

static inline void *_nl_memcpy(void *restrict dest, const void *restrict src,
size_t n)
static inline void *_nl_memcpy(void *dest, const void *src, size_t n)
{
/* Workaround undefined behavior in memcpy() with NULL pointers. */
if (n == 0)
Expand Down Expand Up @@ -703,9 +702,9 @@ static inline char *_nl_inet_ntop(int addr_family, const void *addr, char *buf)
static inline char *_nl_inet_ntop_dup(int addr_family, const void *addr)
{
return (char *)_nl_inet_ntop(addr_family, addr,
malloc((addr_family == AF_INET) ?
INET_ADDRSTRLEN :
INET6_ADDRSTRLEN));
(char *)malloc((addr_family == AF_INET) ?
INET_ADDRSTRLEN :
INET6_ADDRSTRLEN));
}

/*****************************************************************************/
Expand Down