From d912068ad826e457f0c0203d1cad02df81c35bbc Mon Sep 17 00:00:00 2001
From: Tim McNamara <code@timmcnamara.co.nz>
Date: Thu, 7 Jun 2018 21:51:38 +1200
Subject: [PATCH] Remove duplicated lines in contrib/tzcode/stdtime/private.h

Note by imp: this is clearly a mis-merge from the vendor branch which
doesn't have this stutter in it.

Reviewed by:		imp@,ngie@
Pull Request:		https://github.com/freebsd/freebsd-src/pull/154
---
 contrib/tzcode/stdtime/private.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/contrib/tzcode/stdtime/private.h b/contrib/tzcode/stdtime/private.h
index ab1397f31da2..8f8f725f8193 100644
--- a/contrib/tzcode/stdtime/private.h
+++ b/contrib/tzcode/stdtime/private.h
@@ -230,15 +230,6 @@ const char *	scheck(const char * string, const char * format);
 #define	TYPE_INTEGRAL(type) (((type) 0.5) != 0.5)
 #endif /* !defined TYPE_INTEGRAL */
 
-/*
-** Since the definition of TYPE_INTEGRAL contains floating point numbers,
-** it cannot be used in preprocessor directives.
-*/
-
-#ifndef TYPE_INTEGRAL
-#define TYPE_INTEGRAL(type) (((type) 0.5) != 0.5)
-#endif /* !defined TYPE_INTEGRAL */
-
 #ifndef INT_STRLEN_MAXIMUM
 /*
 ** 302 / 1000 is log10(2.0) rounded up.