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

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index ce8e107c1da05032d7a790ffb79219b06e8a9cf5..c7bfbde0bc37ed88499c479bee73296cd63ac36f 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.99.258.1 2011/03/11 01:21:13 each Exp $ */
+/* $Id: masterdump.c,v 1.99.258.2 2011/03/11 01:28:21 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));