[tz] [PROPOSED PATCH 4/4] Remove CMUCS's gtime function.

Paul Eggert eggert at cs.ucla.edu
Sat Aug 23 01:42:28 UTC 2014


The Mach project has been inactive for decades,
and mktime has evidently replaced gtime.
* Makefile: Remove comment about CMUCS.
* localtime.c (gtime) [CMUCS]: Remove.
* NEWS: Document the above.
---
 Makefile    |  5 -----
 NEWS        |  2 ++
 localtime.c | 19 -------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index d36bc43..99d2826 100644
--- a/Makefile
+++ b/Makefile
@@ -199,11 +199,6 @@ GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \
 # to the end of the "CFLAGS=" line.
 # This variable is not described in X3J11's work.
 #
-# If you want a "gtime" function (a la MACH), add
-#	-DCMUCS
-# to the end of the "CFLAGS=" line
-# This function is not described in X3J11's work.
-#
 # NIST-PCTS:151-2, Version 1.4, (1993-12-03) is a test suite put
 # out by the National Institute of Standards and Technology
 # which claims to test C and Posix conformance.  If you want to pass PCTS, add
diff --git a/NEWS b/NEWS
index 0d31a1f..7f15887 100644
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,8 @@ Unreleased, experimental changes
     For easier maintenance later, some C code has been simplified
     and some lint has been removed.
 
+    The long-obsolete 'gtime' function has been removed.
+
   Changes affecting distribution tarballs
 
     The files checktab.awk and zoneinfo2tdf.pl are now distributed in
diff --git a/localtime.c b/localtime.c
index 8260625..0d30453 100644
--- a/localtime.c
+++ b/localtime.c
@@ -1996,25 +1996,6 @@ timeoff(struct tm *const tmp, const long offset)
 
 #endif /* defined STD_INSPIRED */
 
-#ifdef CMUCS
-
-/*
-** The following is supplied for compatibility with
-** previous versions of the CMUCS runtime library.
-*/
-
-long
-gtime(struct tm *const tmp)
-{
-	const time_t	t = mktime(tmp);
-
-	if (t == WRONG)
-		return -1;
-	return t;
-}
-
-#endif /* defined CMUCS */
-
 /*
 ** XXX--is the below the right way to conditionalize??
 */
-- 
1.9.1



More information about the tz mailing list