summaryrefslogtreecommitdiff
path: root/sysutils/pcvt-utils/patches/patch-ae
blob: de4ae513c150b2371efae3f3ef4f1bc35c83eaf9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
$NetBSD: patch-ae,v 1.2 2011/10/01 21:42:16 dholland Exp $

- avoid symbol name conflict on "sr"

--- fed/select.c.orig	1995-10-07 21:44:51.000000000 +0000
+++ fed/select.c
@@ -46,9 +46,8 @@
 
 #include "fed.h"
 
-int sc, sr, scurchar;
-
-int edit();
+/* "sr" is defined in <curses.h> for some terminal capability?!? */
+int sc, fed_sr, scurchar;
 
 void sel_mode(void)
 {
@@ -153,12 +152,12 @@ int selectc()
 			case 'g':
 			case 'G':
 				dis_cmd("   Exchange: select Destination, then press RETURN or any other Key to ABORT");
-				sr = r;
+				fed_sr = r;
 				sc = c;
 				scurchar = curchar;
 				if((curchar = sel_dest()) == -1)
 				{ /* failsafe */
-					r = sr;
+					r = fed_sr;
 					c = sc;
 					curchar = scurchar;
 				}
@@ -174,12 +173,12 @@ int selectc()
 			case 'm':
 			case 'M':
 				dis_cmd("   Move: select Destination, then press RETURN or any other Key to ABORT");
-				sr = r;
+				fed_sr = r;
 				sc = c;
 				scurchar = curchar;
 				if((curchar = sel_dest()) == -1)
 				{ /* failsafe */
-					r = sr;
+					r = fed_sr;
 					c = sc;
 					curchar = scurchar;
 				}
@@ -320,7 +319,7 @@ void normal_uset(int r, int c)
 	mvwprintw(set_win,(r+1),((c*2)+1),"%c%c",h,l);
 	wmove(set_win,(r+1),((c*2)+1));
 
-	if((r==sr) && (c==sc))
+	if((r==fed_sr) && (c==sc))
 	{
 		wattron(set_win,A_REVERSE);
 		mvwprintw(set_win,(r+1),((c*2)+1),"%c%c",h,l);