From: Ondřej Surý <ondrej@sury.org>
Date: Thu, 8 Nov 2018 18:05:51 +0000 (+0700)
Subject: isc_stdtime_t is always 32-bit now, so remove the always true macro STDTIME_ON_32BITS
X-Git-Tag: v9.13.4~44^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f5fe11f5a9f594b3679f9ba1189935ef48c7afb;p=thirdparty%2Fbind9.git

isc_stdtime_t is always 32-bit now, so remove the always true macro STDTIME_ON_32BITS
---

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index df779c6a432..e870d58703b 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -1591,24 +1591,7 @@ writeheader(dns_dumpctx_t *dctx) {
 		r.base = (unsigned char *)&rawheader;
 		r.length = sizeof(rawheader);
 		isc_buffer_region(&buffer, &r);
-#if !defined(STDTIME_ON_32BITS) || (STDTIME_ON_32BITS + 0) != 1
-		/*
-		 * We assume isc_stdtime_t is a 32-bit integer,
-		 * which should be the case on most platforms.
-		 * If it turns out to be uncommon, we'll need
-		 * to bump the version number and revise the
-		 * header format.
-		 */
-		isc_log_write(dns_lctx,
-			      ISC_LOGCATEGORY_GENERAL,
-			      DNS_LOGMODULE_MASTERDUMP,
-			      ISC_LOG_INFO,
-			      "dumping master file in raw "
-			      "format: stdtime is not 32bits");
-		now32 = 0;
-#else
 		now32 = dctx->now;
-#endif
 		rawversion = 1;
 		if ((dctx->header.flags & DNS_MASTERRAW_COMPAT) != 0)
 			rawversion = 0;
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 3f27bfd97a4..dbea5994e6c 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -6346,17 +6346,14 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
 	if (result == ISC_R_NOMORE)
 		result = ISC_R_SUCCESS;
 	if (timewarn > 0) {
-#if defined(STDTIME_ON_32BITS)
 		isc_stdtime_t stdwarn = (isc_stdtime_t)timewarn;
-		if (timewarn == stdwarn)
-#endif
+		if (timewarn == stdwarn) {
 			set_key_expiry_warning(zone, (isc_stdtime_t)timewarn,
 					       now);
-#if defined(STDTIME_ON_32BITS)
-		else
+		} else {
 			dns_zone_log(zone, ISC_LOG_ERROR,
 				     "key expiry warning time out of range");
-#endif
+		}
 	}
  failure:
 	if (node != NULL)
diff --git a/lib/isc/unix/include/isc/stdtime.h b/lib/isc/unix/include/isc/stdtime.h
index 1a3da825c54..cffe39a1a8d 100644
--- a/lib/isc/unix/include/isc/stdtime.h
+++ b/lib/isc/unix/include/isc/stdtime.h
@@ -25,16 +25,6 @@
  */
 typedef uint32_t isc_stdtime_t;
 
-/* but this flag helps... */
-#define STDTIME_ON_32BITS	1
-
-/*
- * isc_stdtime32_t is a 32-bit version of isc_stdtime_t.  A variable of this
- * type should only be used as an opaque integer (e.g.,) to compare two
- * time values.
- */
-typedef uint32_t isc_stdtime32_t;
-
 ISC_LANG_BEGINDECLS
 /* */
 void
diff --git a/lib/isc/win32/include/isc/stdtime.h b/lib/isc/win32/include/isc/stdtime.h
index e11647f3c7e..9ad2e99de9c 100644
--- a/lib/isc/win32/include/isc/stdtime.h
+++ b/lib/isc/win32/include/isc/stdtime.h
@@ -23,16 +23,6 @@
  */
 typedef uint32_t isc_stdtime_t;
 
-/* but this flag helps... */
-#define STDTIME_ON_32BITS	1
-
-/*
- * isc_stdtime32_t is a 32-bit version of isc_stdtime_t.  A variable of this
- * type should only be used as an opaque integer (e.g.,) to compare two
- * time values.
- */
-typedef uint32_t isc_stdtime32_t;
-
 ISC_LANG_BEGINDECLS
 
 void