merge with 1.9

diff --git a/lib/getdate.y b/lib/getdate.y
index df1a08a98dbdfd9c3c92f033e2dc81ef2a3914e4..1d5690423893749dc1092e8bda6f6526d0ba7afe 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -97,7 +97,7 @@ void *alloca ();
 #undef timezone /* needed for sgi */
 #endif
 
-#if defined(HAVE_SYS_TIMEB_H) || (!defined(USG) && defined(HAVE_FTIME))
+#if defined(HAVE_SYS_TIMEB_H)
 #include <sys/timeb.h>
 #else
 /*