Merge branch '1081-fix-statistics-in-x86-windows-builds' into 'master'

Fix statistics in x86 Windows builds

Closes #1081

See merge request isc-projects/bind9!2025

CHANGES

@@ -1,3 +1,6 @@
+5251.	[bug]		Statistics were broken in x86 Windows builds.
+			[GL #1081]
+
 5250.	[func]		The default size for RSA keys is now 2048 bits,
 			for both ZSKs and KSKs. [GL #1097]
 

doc/arm/Bv9ARM-book.xml

@@ -15352,6 +15352,15 @@ HOST-127.EXAMPLE. MX 0 .
 	    <acronym>BIND</acronym> 8 statistics, if applicable.
 	  </para>
 
+	  <para>
+	    Note: BIND statistics counters are signed 64-bit values on
+	    all platforms except one: 32-bit Windows, where they are
+	    signed 32-bit values.  Given that 32-bit values have a
+	    vastly smaller range than 64-bit values, BIND statistics
+	    counters in 32-bit Windows builds overflow significantly
+	    more quickly than on all other platforms.
+	  </para>
+
 	  <section xml:id="stats_counters"><info><title>Name Server Statistics Counters</title></info>
 
 	    <informaltable colsep="0" rowsep="0">

lib/isc/stats.c

@@ -28,7 +28,11 @@
 #define ISC_STATS_MAGIC			ISC_MAGIC('S', 't', 'a', 't')
 #define ISC_STATS_VALID(x)		ISC_MAGIC_VALID(x, ISC_STATS_MAGIC)
 
+#if defined(_WIN32) && !defined(_WIN64)
+typedef atomic_int_fast32_t isc_stat_t;
+#else
 typedef atomic_int_fast64_t isc_stat_t;
+#endif
 
 struct isc_stats {
 	unsigned int		magic;