git: d912068ad826 - main - Remove duplicated lines in contrib/tzcode/stdtime/private.h

[Warner Losh]

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=d912068ad826e457f0c0203d1cad02df81c35bbc

commit d912068ad826e457f0c0203d1cad02df81c35bbc
Author:     Tim McNamara <code at timmcnamara.co.nz>
AuthorDate: 2018-06-07 09:51:38 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-05-31 22:03:37 +0000

    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.