Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 02:13:01 +01:00
Code Issues Projects Releases Wiki Activity

name conflict with core function might cause linking error

Browse Source
This commit is contained in:
Jfreegman 2014-08-15 12:22:39 -04:00
parent 67f637a1e1
commit 1d6ccf56a8
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/friendlist.c
View File

@ -145,7 +145,7 @@ static int save_blocklist(char *path)
uint8_t lastonline[sizeof(uint64_t)]; uint8_t lastonline[sizeof(uint64_t)];
memcpy(lastonline, &Blocked.list[i].last_on, 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(&tmp.last_on, lastonline, sizeof(uint64_t));
memcpy(data + count * sizeof(BlockedFriend), &tmp, sizeof(BlockedFriend)); memcpy(data + count * sizeof(BlockedFriend), &tmp, sizeof(BlockedFriend));

2
src/misc_tools.c
View File

@ -38,7 +38,7 @@ extern struct user_settings *user_settings_;
static uint64_t current_unix_time; 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 #ifndef WORDS_BIGENDIAN
uint32_t i; uint32_t i;

4
src/misc_tools.h
View File

@ -34,10 +34,10 @@
#endif #endif
#ifndef net_to_host #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 #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 */ /* convert a hex string to binary */
char *hex_string_to_bin(const char *hex_string); char *hex_string_to_bin(const char *hex_string);