summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Clock.c8
-rw-r--r--xclock.c6
2 files changed, 12 insertions, 2 deletions
diff --git a/Clock.c b/Clock.c
index 7860480..5e3d9d1 100644
--- a/Clock.c
+++ b/Clock.c
@@ -1,5 +1,5 @@
/* $Xorg: Clock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/xclock/Clock.c,v 1.2 2004/04/23 19:54:39 eich Exp $ */
+/* $XdotOrg: xc/programs/xclock/Clock.c,v 1.3 2004/10/30 20:33:44 alanc Exp $ */
/***********************************************************
@@ -85,6 +85,10 @@ SOFTWARE.
*/
/* $XFree86: xc/programs/xclock/Clock.c,v 3.25 2003/07/04 16:24:30 eich Exp $ */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <X11/Xlib.h>
#include <X11/StringDefs.h>
#include <X11/IntrinsicP.h>
@@ -1350,7 +1354,7 @@ clock_tic(XtPointer client_data, XtIntervalId *id)
XClearArea (dpy, win,
clear_from, 0, w->core.width - clear_from, w->core.height,
False);
-#ifdef HAS_STRLCAT
+#if defined(HAS_STRLCAT) || defined(HAVE_STRLCPY)
strlcpy (w->clock.prev_time_string+i, time_ptr+i,
sizeof(w->clock.prev_time_string)-i);
#else
diff --git a/xclock.c b/xclock.c
index 9091c57..18e6c16 100644
--- a/xclock.c
+++ b/xclock.c
@@ -1,4 +1,5 @@
/* $Xorg: xclock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */
+/* $XdotOrg: $ */
/*
* xclock -- Hacked from Tony Della Fera's much hacked clock program.
@@ -31,6 +32,11 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xclock.c,v 1.16 2002/10/21 13:33:08 alanh Exp $ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <X11/Xatom.h>