summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--time/dclock/distinfo4
-rw-r--r--time/dclock/patches/patch-ab26
2 files changed, 19 insertions, 11 deletions
diff --git a/time/dclock/distinfo b/time/dclock/distinfo
index b8637e84386..088a505577c 100644
--- a/time/dclock/distinfo
+++ b/time/dclock/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/06/15 22:46:27 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/01/07 05:48:11 jmcneill Exp $
SHA1 (dclock.shar.Z) = 1e9dac79e11f7075fd216e90d45218f499c9b035
Size (dclock.shar.Z) = 23855 bytes
SHA1 (patch-aa) = 2566c9d51455ab1c1a47a0a81394eb01fcef972a
-SHA1 (patch-ab) = a09a39fa57baa92ef50febfb060a0ab50febc4e2
+SHA1 (patch-ab) = 625f095e9c7034ad56fc2ed3aa1e58b84aa49270
SHA1 (patch-ac) = 71ea6994b2466ca69a2e5a0b23bd944f94f182be
diff --git a/time/dclock/patches/patch-ab b/time/dclock/patches/patch-ab
index 4dee1d05e0a..14a9f5e0882 100644
--- a/time/dclock/patches/patch-ab
+++ b/time/dclock/patches/patch-ab
@@ -1,11 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:17 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2003/01/07 05:48:10 jmcneill Exp $
-Patch from Robert Elz to make the clock behave as a clock,
-rather than a sundial.
-itojun's y2k patch
-
---- Dclock.c 2000/01/01 04:40:38 1.1
-+++ Dclock.c 2000/01/01 04:40:53
+--- Dclock.c.orig Tue Jan 7 01:43:15 2003
++++ Dclock.c Tue Jan 7 01:43:49 2003
@@ -21,8 +21,6 @@
#define CLOCK_WIDTH 256
#define CLOCK_HEIGHT 80
@@ -44,15 +40,27 @@ itojun's y2k patch
}
/* The colon[0] area is blank */
if (w->dclock.colon[0])
-@@ -629,7 +627,7 @@
+@@ -627,9 +625,9 @@
+ {
+ Boolean save_scroll = w->dclock.scroll;
Boolean save_fade = w->dclock.fade;
- long t;
+- long t;
++ time_t t;
- if (!XtIsRealized(w))
+ if (!XtIsRealized((Widget) w))
return;
if (w->dclock.interval_id != (XtIntervalId)NULL) {
+@@ -663,7 +661,7 @@
+ {
+ char buf[11];
+ Boolean alarm_went_off = False;
+- long t = time(0);
++ time_t t = time(0);
+ register struct tm *l_time = localtime(&t);
+ int digit_w = w->dclock.digit_w;
+ int digit_h = w->dclock.digit_h;
@@ -802,7 +800,7 @@
turn_off[i] = oldmask & ~newmask;
}