From a4cd497318f715971cdb6dd08113d61e241b07ea Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sun, 7 Feb 2010 17:01:10 +0000 Subject: [PATCH] Do not use htons/htonl in makefont.c, since we already have hton16/hton32 which do not require to initialise winsock on Windows. Addresses #48. --- tools/makefont.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/makefont.c b/tools/makefont.c index e4a027b..ef0e026 100644 --- a/tools/makefont.c +++ b/tools/makefont.c @@ -30,6 +30,7 @@ #include #include +#include "caca_stubs.h" #include "caca.h" /* Split our big strings into chunks of 480 characters, because it is @@ -434,13 +435,13 @@ static int printf_unicode(struct glyph *g) static int printf_u32(char const *fmt, uint32_t i) { - uint32_t ni = htonl(i); + uint32_t ni = hton32(i); return printf_hex(fmt, (uint8_t *)&ni, 4); } static int printf_u16(char const *fmt, uint16_t i) { - uint16_t ni = htons(i); + uint16_t ni = hton16(i); return printf_hex(fmt, (uint8_t *)&ni, 2); }