X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fircd_snprintf.c;h=eaec2cddb403acce5a4e8670ae8cf0c346610a28;hb=1570a04e15bec6b2945e4351b1e05211aecdcacc;hp=91a9f082283648467c7f76c7a769d604081bb0d4;hpb=5246a6127cca4385da318f2e75271b4f5907947b;p=ircu2.10.12-pk.git

diff --git a/ircd/ircd_snprintf.c b/ircd/ircd_snprintf.c
index 91a9f08..eaec2cd 100644
--- a/ircd/ircd_snprintf.c
+++ b/ircd/ircd_snprintf.c
@@ -24,10 +24,11 @@
 
 #include "client.h"
 #include "channel.h"
+#include "ircd_log.h"
 #include "ircd_snprintf.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -35,7 +36,7 @@
 #include <time.h>
 
 /* 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. */
@@ -43,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
@@ -1742,10 +1743,8 @@ doprintf(struct Client *dest, struct BufData *buf_p, const char *fmt,
 	  *((char *)va_arg(vp, int *)) = TOTAL(buf_p);
 	else if (fld_s.flags & TYPE_SHORT) /* eg, %hn */
 	  *((short *)va_arg(vp, int *)) = TOTAL(buf_p);
-#ifdef HAVE_LONG_LONG
 	else if (fld_s.flags & TYPE_QUAD) /* eg, %qn */
-	  *((my_quad_t *)va_arg(vp, my_quad_t *)) = TOTAL(buf_p);
-#endif /* HAVE_LONG_LONG */
+	  *((int64_t *)va_arg(vp, int64_t *)) = TOTAL(buf_p);
 	else if (fld_s.flags & TYPE_LONG) /* eg, %ln */
 	  *((long *)va_arg(vp, long *)) = TOTAL(buf_p);
 	else if (fld_s.flags & TYPE_INTMAX) /* eg, %jn */
@@ -1806,11 +1805,9 @@ 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);
-#ifdef HAVE_LONG_LONG
+	  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, _large_t);
-#endif
+	  fld_s.value.v_int = va_arg(vp, uint64_t);
 	else if (fld_s.flags & TYPE_LONG) /* eg, %lu */
 	  fld_s.value.v_int = va_arg(vp, unsigned long);
 	else if (fld_s.flags & TYPE_INTMAX) /* eg, %ju */
@@ -1832,10 +1829,8 @@ doprintf(struct Client *dest, struct BufData *buf_p, const char *fmt,
 	  signed_int = (char)va_arg(vp, unsigned int);
 	else if (fld_s.flags & TYPE_SHORT) /* eg, %hd */
 	  signed_int = (short)va_arg(vp, unsigned int);
-#ifdef HAVE_LONG_LONG
 	else if (fld_s.flags & TYPE_QUAD) /* eg, %qd */
-	  signed_int = va_arg(vp, _large_t);
-#endif
+	  signed_int = va_arg(vp, int64_t);
 	else if (fld_s.flags & TYPE_LONG) /* eg, %ld */
 	  signed_int = va_arg(vp, long);
 	else if (fld_s.flags & TYPE_INTMAX) /* eg, %jd */