From: Paul Eggert <eggert@twinsun.com>
Date: Mon, 30 Dec 1996 07:34:15 +0000 (+0000)
Subject: (MKTIME_OBJ): Use our mktime instead of SCO 3.2v4.2's, since it
X-Git-Tag: emacs-20.1~3159
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=22a8b81674876a700db26e237270c0fc6c66ae01;p=emacs.git

(MKTIME_OBJ): Use our mktime instead of SCO 3.2v4.2's, since it
botches time arithmetic as used by display-time.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 1f186c57db7..8af4538f33a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -477,8 +477,9 @@ ALL_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE LD_SWITCH_SITE $(LDFLAGS)
 #define GETLOADAVG_OBJ getloadavg.o
 #endif
 
-/* NEXTSTEP mktime wrongly ignores TZ.  */
-#if HAVE_MKTIME && ! defined (_NEXT_SOURCE)
+/* NEXTSTEP mktime wrongly ignores TZ.
+   SCO 3.2v4.2 mktime botches time arithmetic as used by display-time.  */
+#if HAVE_MKTIME && ! defined (_NEXT_SOURCE) && ! defined (SCO_R4)
 #define MKTIME_OBJ
 #else
 #define MKTIME_OBJ mktime.o