X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fircd_snprintf.c;h=eaec2cddb403acce5a4e8670ae8cf0c346610a28;hb=refs%2Fheads%2Fupstream-ssl;hp=42f0e1054900a164016e72344406e6bacf1a4b97;hpb=fc21303989a07d6091ef684150db29c49f682614;p=ircu2.10.12-pk.git diff --git a/ircd/ircd_snprintf.c b/ircd/ircd_snprintf.c index 42f0e10..eaec2cd 100644 --- a/ircd/ircd_snprintf.c +++ b/ircd/ircd_snprintf.c @@ -36,7 +36,7 @@ #include /* Inhibit complaints when we use GCC extensions */ -#if defined(__GNUC__) && defined(HAVE_LONG_LONG) +#if defined(__GNUC__) && SIZEOF_LONG_LONG # define EXTENSION __extension__ #else /** Fallback (empty) definition of EXTENSION. */ @@ -44,7 +44,7 @@ #endif /* Find the largest type */ -#ifdef HAVE_LONG_LONG +#if SIZEOF_LONG_LONG EXTENSION typedef long long _large_t; EXTENSION typedef unsigned long long _ularge_t; # define SIZEOF__LARGE_T SIZEOF_LONG_LONG @@ -1805,7 +1805,7 @@ doprintf(struct Client *dest, struct BufData *buf_p, const char *fmt, if (fld_s.flags & TYPE_CHAR) /* eg, %hhu */ fld_s.value.v_int = (unsigned char)va_arg(vp, unsigned int); else if (fld_s.flags & TYPE_SHORT) /* eg, %hu */ - fld_s.value.v_int = (short)va_arg(vp, unsigned int); + fld_s.value.v_int = (unsigned short)va_arg(vp, unsigned int); else if (fld_s.flags & TYPE_QUAD) /* eg, %qu */ fld_s.value.v_int = va_arg(vp, uint64_t); else if (fld_s.flags & TYPE_LONG) /* eg, %lu */