Reversing prior change, turns out not to be legal on all compilers.

This commit is contained in:
Evan Hunt
2011-03-11 01:28:29 +00:00
parent aa691f6fb4
commit d7112a033e
+3 -4
View File
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: masterdump.c,v 1.99.16.1 2011/03/11 01:21:57 each Exp $ */
/* $Id: masterdump.c,v 1.99.16.2 2011/03/11 01:28:29 each Exp $ */
/*! \file */
@@ -1381,7 +1381,7 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
isc_buffer_region(&buffer, &r);
isc_buffer_putuint32(&buffer, dns_masterformat_raw);
isc_buffer_putuint32(&buffer, DNS_RAWFORMAT_VERSION);
#if (sizeof(isc_uint32_t) != sizeof(isc_stdtime_t))
if (sizeof(now32) != sizeof(dctx->now)) {
/*
* We assume isc_stdtime_t is a 32-bit integer,
* which should be the case on most cases.
@@ -1396,9 +1396,8 @@ dumptostreaminc(dns_dumpctx_t *dctx) {
"dumping master file in raw "
"format: stdtime is not 32bits");
now32 = 0;
#else
} else
now32 = dctx->now;
#endif
isc_buffer_putuint32(&buffer, now32);
INSIST(isc_buffer_usedlength(&buffer) <=
sizeof(rawheader));