mirror of
https://github.com/Tha14/toxic.git
synced 2024-11-22 21:23:01 +01:00
name conflict with core function might cause linking error
This commit is contained in:
parent
67f637a1e1
commit
1d6ccf56a8
@ -145,7 +145,7 @@ static int save_blocklist(char *path)
|
||||
|
||||
uint8_t lastonline[sizeof(uint64_t)];
|
||||
memcpy(lastonline, &Blocked.list[i].last_on, sizeof(uint64_t));
|
||||
host_to_net(lastonline, sizeof(uint64_t));
|
||||
hst_to_net(lastonline, sizeof(uint64_t));
|
||||
memcpy(&tmp.last_on, lastonline, sizeof(uint64_t));
|
||||
|
||||
memcpy(data + count * sizeof(BlockedFriend), &tmp, sizeof(BlockedFriend));
|
||||
|
@ -38,7 +38,7 @@ extern struct user_settings *user_settings_;
|
||||
|
||||
static uint64_t current_unix_time;
|
||||
|
||||
void host_to_net(uint8_t *num, uint16_t numbytes)
|
||||
void hst_to_net(uint8_t *num, uint16_t numbytes)
|
||||
{
|
||||
#ifndef WORDS_BIGENDIAN
|
||||
uint32_t i;
|
||||
|
@ -34,10 +34,10 @@
|
||||
#endif
|
||||
|
||||
#ifndef net_to_host
|
||||
#define net_to_host(x, y) host_to_net(x, y)
|
||||
#define net_to_host(x, y) hst_to_net(x, y)
|
||||
#endif
|
||||
|
||||
void host_to_net(uint8_t *num, uint16_t numbytes);
|
||||
void hst_to_net(uint8_t *num, uint16_t numbytes);
|
||||
|
||||
/* convert a hex string to binary */
|
||||
char *hex_string_to_bin(const char *hex_string);
|
||||
|
Loading…
Reference in New Issue
Block a user