From f2b7fd780afc1e5af2361c412570c105cde1f297 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Mon, 22 Mar 2010 05:10:19 +0000
Subject: rename text() to wrtext(), aligning it with most other output
 routines, and avoiding a compile error on powerpc64.

XXX: this tries to make a ".text" symbol, which already exists...
---
 backgammon/teachgammon/teach.c  | 30 +++++++++++++++---------------
 backgammon/teachgammon/ttext2.c |  8 ++++----
 backgammon/teachgammon/tutor.c  |  6 +++---
 3 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'backgammon/teachgammon')

diff --git a/backgammon/teachgammon/teach.c b/backgammon/teachgammon/teach.c
index 5c654b3f..9d10908d 100644
--- a/backgammon/teachgammon/teach.c
+++ b/backgammon/teachgammon/teach.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: teach.c,v 1.20 2009/08/12 05:17:57 dholland Exp $	*/
+/*	$NetBSD: teach.c,v 1.21 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
 #if 0
 static char sccsid[] = "@(#)teach.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: teach.c,v 1.20 2009/08/12 05:17:57 dholland Exp $");
+__RCSID("$NetBSD: teach.c,v 1.21 2010/03/22 05:10:19 mrg Exp $");
 #endif
 #endif				/* not lint */
 
@@ -87,9 +87,9 @@ main(int argc __unused, char *argv[])
 		raw.c_oflag &= ~(ONLCR | OXTABS);
 		clear();
 	}
-	text(hello);
-	text(list);
-	i = text(contin);
+	wrtext(hello);
+	wrtext(list);
+	i = wrtext(contin);
 	if (i == 0)
 		i = 2;
 	init();
@@ -99,42 +99,42 @@ main(int argc __unused, char *argv[])
 			leave();
 
 		case 2:
-			if ((i = text(intro1)) != 0)
+			if ((i = wrtext(intro1)) != 0)
 				break;
 			wrboard();
-			if ((i = text(intro2)) != 0)
+			if ((i = wrtext(intro2)) != 0)
 				break;
 
 		case 3:
-			if ((i = text(moves)) != 0)
+			if ((i = wrtext(moves)) != 0)
 				break;
 
 		case 4:
-			if ((i = text(removepiece)) != 0)
+			if ((i = wrtext(removepiece)) != 0)
 				break;
 
 		case 5:
-			if ((i = text(hits)) != 0)
+			if ((i = wrtext(hits)) != 0)
 				break;
 
 		case 6:
-			if ((i = text(endgame)) != 0)
+			if ((i = wrtext(endgame)) != 0)
 				break;
 
 		case 7:
-			if ((i = text(doubl)) != 0)
+			if ((i = wrtext(doubl)) != 0)
 				break;
 
 		case 8:
-			if ((i = text(stragy)) != 0)
+			if ((i = wrtext(stragy)) != 0)
 				break;
 
 		case 9:
-			if ((i = text(prog)) != 0)
+			if ((i = wrtext(prog)) != 0)
 				break;
 
 		case 10:
-			if ((i = text(lastch)) != 0)
+			if ((i = wrtext(lastch)) != 0)
 				break;
 		}
 	tutor();
diff --git a/backgammon/teachgammon/ttext2.c b/backgammon/teachgammon/ttext2.c
index 99e3b49c..2a0d5ee4 100644
--- a/backgammon/teachgammon/ttext2.c
+++ b/backgammon/teachgammon/ttext2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ttext2.c,v 1.8 2005/07/01 01:12:39 jmc Exp $	*/
+/*	$NetBSD: ttext2.c,v 1.9 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)ttext2.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: ttext2.c,v 1.8 2005/07/01 01:12:39 jmc Exp $");
+__RCSID("$NetBSD: ttext2.c,v 1.9 2010/03/22 05:10:19 mrg Exp $");
 #endif
 #endif				/* not lint */
 
@@ -127,7 +127,7 @@ const char   *const lastch[] = {
 
 
 int
-text(const char *const *txt)
+wrtext(const char *const *txt)
 {
 	const char  *const *begin;
 	const char   *a;
@@ -157,7 +157,7 @@ text(const char *const *txt)
 							clear();
 					} else
 						writec('\n');
-					text(list);
+					wrtext(list);
 					writel(prompt);
 					continue;
 				}
diff --git a/backgammon/teachgammon/tutor.c b/backgammon/teachgammon/tutor.c
index a5b0a4c9..d50d051d 100644
--- a/backgammon/teachgammon/tutor.c
+++ b/backgammon/teachgammon/tutor.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tutor.c,v 1.8 2009/08/12 05:17:57 dholland Exp $	*/
+/*	$NetBSD: tutor.c,v 1.9 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)tutor.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: tutor.c,v 1.8 2009/08/12 05:17:57 dholland Exp $");
+__RCSID("$NetBSD: tutor.c,v 1.9 2010/03/22 05:10:19 mrg Exp $");
 #endif
 #endif				/* not lint */
 
@@ -89,7 +89,7 @@ tutor(void)
 		}
 		if (tflag)
 			curmove(18, 0);
-		text(*test[i].com);
+		wrtext(*test[i].com);
 		if (!tflag)
 			writec('\n');
 		if (i == maxmoves)
-- 
cgit v1.2.3-56-ge451