Module Name: src
Committed By: ginsbach
Date: Wed May 6 02:59:12 UTC 2009
Modified Files:
src/games/hack: extern.h hack.end.c hack.unix.c
Log Message:
Change getdate() to getdatestr() since the former maybe present on systems
supporting X/Open System Interfaces Extension (XSI) getdate() in <time.h>.
This prevents a function prototype conflict.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/games/hack/extern.h src/games/hack/hack.end.c \
src/games/hack/hack.unix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hack/extern.h
diff -u src/games/hack/extern.h:1.9 src/games/hack/extern.h:1.10
--- src/games/hack/extern.h:1.9 Sun Jan 18 00:34:03 2009
+++ src/games/hack/extern.h Wed May 6 02:59:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.9 2009/01/18 00:34:03 lukem Exp $ */
+/* $NetBSD: extern.h,v 1.10 2009/05/06 02:59:12 ginsbach Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -576,7 +576,7 @@
void setrandom(void);
struct tm *getlt(void);
int getyear(void);
-char *getdate(void);
+char *getdatestr(void);
int phase_of_the_moon(void);
int night(void);
int midnight(void);
Index: src/games/hack/hack.end.c
diff -u src/games/hack/hack.end.c:1.9 src/games/hack/hack.end.c:1.10
--- src/games/hack/hack.end.c:1.9 Mon Jan 28 06:55:41 2008
+++ src/games/hack/hack.end.c Wed May 6 02:59:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.end.c,v 1.9 2008/01/28 06:55:41 dholland Exp $ */
+/* $NetBSD: hack.end.c,v 1.10 2009/05/06 02:59:12 ginsbach Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.end.c,v 1.9 2008/01/28 06:55:41 dholland Exp $");
+__RCSID("$NetBSD: hack.end.c,v 1.10 2009/05/06 02:59:12 ginsbach Exp $");
#endif /* not lint */
#include <signal.h>
@@ -360,7 +360,7 @@
(t0->name)[NAMSZ] = 0;
(void) strncpy(t0->death, killer, DTHSZ);
(t0->death)[DTHSZ] = 0;
- (void) strcpy(t0->date, getdate());
+ (void) strcpy(t0->date, getdatestr());
/* assure minimum number of points */
if (t0->points < POINTSMIN)
Index: src/games/hack/hack.unix.c
diff -u src/games/hack/hack.unix.c:1.9 src/games/hack/hack.unix.c:1.10
--- src/games/hack/hack.unix.c:1.9 Wed Apr 2 18:36:41 2003
+++ src/games/hack/hack.unix.c Wed May 6 02:59:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.unix.c,v 1.9 2003/04/02 18:36:41 jsm Exp $ */
+/* $NetBSD: hack.unix.c,v 1.10 2009/05/06 02:59:12 ginsbach Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.unix.c,v 1.9 2003/04/02 18:36:41 jsm Exp $");
+__RCSID("$NetBSD: hack.unix.c,v 1.10 2009/05/06 02:59:12 ginsbach Exp $");
#endif /* not lint */
/* This file collects some Unix dependencies; hack.pager.c contains some more */
@@ -118,7 +118,7 @@
}
char *
-getdate()
+getdatestr()
{
static char datestr[7];
struct tm *lt = getlt();
