changeset 25646:7c19110d764f

13414 libcurses: symbol '_win' is multiply-defined Reviewed by: Rich Lowe <richlowe@richlowe.net> Approved by: Dan McDonald <danmcd@joyent.com>
author Toomas Soome <tsoome@me.com>
date Tue, 26 May 2020 10:28:19 +0300
parents 64f5f6e50ae5
children 00a82aa93317
files usr/src/ucblib/libcurses/cr_put.c
diffstat 1 files changed, 3 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/ucblib/libcurses/cr_put.c	Mon Jan 11 15:29:35 2021 +0000
+++ b/usr/src/ucblib/libcurses/cr_put.c	Tue May 26 10:28:19 2020 +0300
@@ -4,7 +4,7 @@
  */
 
 /*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 /*
  * Copyright (c) 1980 Regents of the University of California.
@@ -12,15 +12,6 @@
  * specifies the terms and conditions for redistribution.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*LINTLIBRARY*/
-
-#ifndef lint
-static char
-sccsid[] = "@(#)cr_put.c 1.7 89/03/27 SMI"; /* from UCB 5.1 85/06/07 */
-#endif	/* not lint */
-
 #include	<string.h>
 #include	"curses.ext"
 #include	<term.h>
@@ -51,14 +42,14 @@
 
 static int	outcol, outline, destcol, destline;
 
-WINDOW		*_win;
+extern WINDOW		*_win;
 
 int
 mvcur(int ly, int lx, int y, int x)
 {
 #ifdef DEBUG
 	fprintf(outf, "MVCUR: moving cursor from (%d,%d) to (%d,%d)\n",
-		ly, lx, y, x);
+	    ly, lx, y, x);
 #endif
 	destcol = x;
 	destline = y;