Avoid conflict of __cputchar() prototype.

This commit is contained in:
minoura 2000-02-29 15:28:49 +00:00
parent aa5f5ccaac
commit 53ec9e3080

View file

@ -1,8 +1,9 @@
$NetBSD: patch-al,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
$NetBSD: patch-al,v 1.2 2000/02/29 15:28:49 minoura Exp $
--- ./uip/vmh.c.orig Tue Feb 9 20:30:00 1999
+++ ./uip/vmh.c Mon Nov 1 19:13:30 1999
@@ -24,4 +24,7 @@
+++ ./uip/vmh.c Tue Feb 29 23:19:05 2000
@@ -23,6 +23,9 @@
If curses ever gets fixed, then XYZ code can be removed
*/
+#ifdef UNISTD
@ -10,8 +11,14 @@ $NetBSD: patch-al,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
+#endif
#ifdef __osf__
#define _BSD
@@ -88,5 +91,9 @@
#endif
@@ -85,9 +88,15 @@
#define _maxy maxy
#define _curx curx /* curses.h */
#define _cury cury
+#ifndef __NetBSD__
void __cputchar __P((int));
+#endif
#undef _putchar
+#ifdef BSD44
+#define _putchar __cputchar
@ -20,10 +27,13 @@ $NetBSD: patch-al,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
+#endif
#include <sys/ioctl.h> /* sgttyb */
#endif /* !__NCURSES_H && (BSD44 || linux) */
@@ -1510,5 +1517,5 @@
@@ -1509,7 +1518,7 @@
tpgrp;
TYPESIG (*tstat) ();
- if ((pgrp = getpgrp (0)) == NOTOK)
+ if ((pgrp = getpgrp (/*0*/)) == NOTOK)
adios ("process group", "unable to determine");
for (;;) {
if (ioctl (fileno (stdin), TIOCGPGRP, (char *) &tpgrp) == NOTOK)