QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Some AIX versions define a macro named ip_len

Browse Source 
So, workaround that by using ip_len_ :/
This commit is contained in:
Frank Denis
2026-04-05 21:24:46 +02:00
parent cb797420ed
commit fef6efea2e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/include/sodium/utils.h
+1 -1
View File
@@ -93,7 +93,7 @@ int sodium_base642bin(unsigned char *const bin, const size_t bin_maxlen, const c
const char **const b64_end, const int variant) __attribute__((nonnull(1)));
SODIUM_EXPORT
int sodium_ip2bin(unsigned char bin[16], const char *ip, size_t ip_len)
int sodium_ip2bin(unsigned char bin[16], const char *ip, size_t ip_len_)
__attribute__((warn_unused_result)) __attribute__((nonnull));
SODIUM_EXPORT
src/libsodium/sodium/codecs.c
+3 -2
View File
@@ -476,9 +476,10 @@ parse_ipv6(const char *src, const char *end, unsigned char out[16])
}
int
sodium_ip2bin(unsigned char bin[16], const char *ip, size_t ip_len)
sodium_ip2bin(unsigned char bin[16], const char *ip,
size_t ip_len_) /* Some AIX versions define a macro named "ip_len" */
{
const char *ip_end = ip + ip_len;
const char *ip_end = ip + ip_len_;
const char *end;
const char *z;
unsigned char v4[4];