diff -r 0006f8158d6e -r 503cfa50c8c3 libpurple/protocols/zephyr/Zinternal.c --- a/libpurple/protocols/zephyr/Zinternal.c Thu Dec 17 23:50:15 2020 -0600 +++ b/libpurple/protocols/zephyr/Zinternal.c Fri Dec 18 01:38:49 2020 -0600 @@ -540,8 +540,8 @@ notice->z_uid.tv.tv_sec = realtime / G_USEC_PER_SEC; notice->z_uid.tv.tv_usec = realtime - notice->z_uid.tv.tv_sec * G_USEC_PER_SEC; - notice->z_uid.tv.tv_sec = htonl((unsigned long)notice->z_uid.tv.tv_sec); - notice->z_uid.tv.tv_usec = htonl((unsigned long)notice->z_uid.tv.tv_usec); + notice->z_uid.tv.tv_sec = GUINT64_TO_BE((guint64)notice->z_uid.tv.tv_sec); + notice->z_uid.tv.tv_usec = GUINT64_TO_BE((guint64)notice->z_uid.tv.tv_usec); memcpy(¬ice->z_uid.zuid_addr, &__My_addr, sizeof(__My_addr)); @@ -617,7 +617,7 @@ return (ZERR_HEADERLEN); ptr += strlen(ptr)+1; - if (ZMakeAscii16(ptr, end-ptr, ntohs(notice->z_port)) == ZERR_FIELDLEN) + if (ZMakeAscii16(ptr, end-ptr, g_ntohs(notice->z_port)) == ZERR_FIELDLEN) return (ZERR_HEADERLEN); ptr += strlen(ptr)+1; @@ -776,9 +776,9 @@ partnotice.z_uid.tv.tv_usec = realtime - partnotice.z_uid.tv.tv_sec * G_USEC_PER_SEC; partnotice.z_uid.tv.tv_sec = - htonl((unsigned long)partnotice.z_uid.tv.tv_sec); + GUINT64_TO_BE((guint64)partnotice.z_uid.tv.tv_sec); partnotice.z_uid.tv.tv_usec = - htonl((unsigned long)partnotice.z_uid.tv.tv_usec); + GUINT64_TO_BE((guint64)partnotice.z_uid.tv.tv_usec); memcpy(&partnotice.z_uid.zuid_addr, &__My_addr, sizeof(__My_addr)); } message_len = MIN(notice->z_message_len - offset, fragsize);