diff options
| author |   roy <roy@NetBSD.org> | 2009-07-13 19:05:39 +0000 |
|---|---|---|
| committer | roy <roy@NetBSD.org> | 2009-07-13 19:05:39 +0000 |
| commit | 1a8f73c921695fb365fd62992e90e8d40e94343a (patch) | |
| tree | 447f607459addcce932c00ca52c03ac9e462c321 /boggle | |
| parent | 1f35120ec096783ec21160ac00f22c0fb221a918 (diff) | |
| download | bsdgames-darwin-1a8f73c921695fb365fd62992e90e8d40e94343a.tar.gz bsdgames-darwin-1a8f73c921695fb365fd62992e90e8d40e94343a.tar.zst bsdgames-darwin-1a8f73c921695fb365fd62992e90e8d40e94343a.zip | |
Rename internal getline() function to get_line() so it does
conflict with the soon to be added getline(3) libc function.
Diffstat (limited to 'boggle')
| -rw-r--r-- | boggle/boggle/bog.c | 6 | ||||
| -rw-r--r-- | boggle/boggle/extern.h | 4 | ||||
| -rw-r--r-- | boggle/boggle/mach.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/boggle/boggle/bog.c b/boggle/boggle/bog.c index fb9ff520..edb0a93c 100644 --- a/boggle/boggle/bog.c +++ b/boggle/boggle/bog.c @@ -1,4 +1,4 @@ -/* $NetBSD: bog.c,v 1.22 2008/07/20 01:03:21 lukem Exp $ */ +/* $NetBSD: bog.c,v 1.23 2009/07/13 19:05:39 roy Exp $ */ /*- * Copyright (c) 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\ #if 0 static char sccsid[] = "@(#)bog.c 8.2 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: bog.c,v 1.22 2008/07/20 01:03:21 lukem Exp $"); +__RCSID("$NetBSD: bog.c,v 1.23 2009/07/13 19:05:39 roy Exp $"); #endif #endif /* not lint */ @@ -334,7 +334,7 @@ playgame(void) } while (1) { - if (getline(buf) == NULL) { + if (get_line(buf) == NULL) { if (feof(stdin)) clearerr(stdin); break; diff --git a/boggle/boggle/extern.h b/boggle/boggle/extern.h index 05e5b9ac..7c06ea75 100644 --- a/boggle/boggle/extern.h +++ b/boggle/boggle/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.9 2005/07/01 16:38:24 jmc Exp $ */ +/* $NetBSD: extern.h,v 1.10 2009/07/13 19:05:39 roy Exp $ */ /*- * Copyright (c) 1993 @@ -43,7 +43,7 @@ void delay(int); long dictseek(FILE *, long, int); void findword(void); void flushin(FILE *); -char *getline(char *); +char *get_line(char *); void getword(char *); int help(void); int inputch(void); diff --git a/boggle/boggle/mach.c b/boggle/boggle/mach.c index aaaacbbb..ba68287c 100644 --- a/boggle/boggle/mach.c +++ b/boggle/boggle/mach.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach.c,v 1.18 2008/08/08 16:10:47 drochner Exp $ */ +/* $NetBSD: mach.c,v 1.19 2009/07/13 19:05:39 roy Exp $ */ /*- * Copyright (c) 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)mach.c 8.1 (Berkeley) 6/11/93"; #else -__RCSID("$NetBSD: mach.c,v 1.18 2008/08/08 16:10:47 drochner Exp $"); +__RCSID("$NetBSD: mach.c,v 1.19 2009/07/13 19:05:39 roy Exp $"); #endif #endif /* not lint */ @@ -162,7 +162,7 @@ prwidth(const char *const base[], int indx) * - doesn't accept words longer than MAXWORDLEN or containing caps */ char * -getline(char *q) +get_line(char *q) { int ch, done; char *p; |