From 1d6ccf56a8a011d8c5b31208f3b559b838781501 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Fri, 15 Aug 2014 12:22:39 -0400 Subject: [PATCH] name conflict with core function might cause linking error --- src/friendlist.c | 2 +- src/misc_tools.c | 2 +- src/misc_tools.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/friendlist.c b/src/friendlist.c index eab45be..a3ca327 100644 --- a/src/friendlist.c +++ b/src/friendlist.c @@ -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)); diff --git a/src/misc_tools.c b/src/misc_tools.c index d27fe20..83fceff 100644 --- a/src/misc_tools.c +++ b/src/misc_tools.c @@ -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; diff --git a/src/misc_tools.h b/src/misc_tools.h index 114808c..444943b 100644 --- a/src/misc_tools.h +++ b/src/misc_tools.h @@ -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);