aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkevlo <kevlo@FreeBSD.org>2007-07-02 17:34:37 +0800
committerkevlo <kevlo@FreeBSD.org>2007-07-02 17:34:37 +0800
commitff37a3341236cc7a8b971398d79bfbabc214eb6b (patch)
tree7cc466779f432c10d30dba2c9b496a382ada2850
parenteaf67f48134ef874b70c24ca874608b8bb41d6cc (diff)
downloadfreebsd-ports-gnome-ff37a3341236cc7a8b971398d79bfbabc214eb6b.tar.gz
freebsd-ports-gnome-ff37a3341236cc7a8b971398d79bfbabc214eb6b.tar.zst
freebsd-ports-gnome-ff37a3341236cc7a8b971398d79bfbabc214eb6b.zip
Fix build with gcc4.
Approved by: anders (maintainer)
-rw-r--r--comms/minicom/files/patch-af46
1 files changed, 44 insertions, 2 deletions
diff --git a/comms/minicom/files/patch-af b/comms/minicom/files/patch-af
index 387e345e911a..785aa386f70a 100644
--- a/comms/minicom/files/patch-af
+++ b/comms/minicom/files/patch-af
@@ -1,5 +1,14 @@
---- src/window.c.orig Sun Jan 27 18:57:13 2002
-+++ src/window.c Sun Jan 27 18:57:25 2002
+--- src/window.c.orig 2003-05-17 04:06:26.000000000 +0800
++++ src/window.c 2007-06-22 11:33:39.000000000 +0800
+@@ -62,7 +62,7 @@
+ static char *CS, *SF, *SR, *VB, *BL;
+ static char *VE, *VI, *KS, *KE;
+ static char *CD, *CL, *IC, *DC;
+-static char *BC, *CR, *NL;
++static char *mcBC, *CR, *NL;
+ #if ST_LINE
+ static char *TS, *FS, *DS;
+ #endif
@@ -110,7 +110,7 @@
int useattr = 1;
@@ -9,3 +18,36 @@
int usecolor = 0;
WIN *stdwin;
char *_tptr = CNULL;
+@@ -322,8 +322,8 @@
+ else if (NL != CNULL && x == 0 && x == curx && y == cury + 1)
+ outstr(NL);
+ #endif
+- else if (BC != CNULL && y == cury && x == curx - 1)
+- outstr(BC);
++ else if (mcBC != CNULL && y == cury && x == curx - 1)
++ outstr(mcBC);
+ else
+ outstr(tgoto(CM, x, y));
+ curx = x;
+@@ -1918,7 +1918,7 @@
+ CL = tgetstr("cl", &_tptr);
+ IC = tgetstr("ic", &_tptr);
+ DC = tgetstr("dc", &_tptr);
+- BC = tgetstr("bc", &_tptr);
++ mcBC = tgetstr("bc", &_tptr);
+ CR = tgetstr("cr", &_tptr);
+ NL = tgetstr("nl", &_tptr);
+ AC = tgetstr("ac", &_tptr);
+@@ -1967,10 +1967,10 @@
+ _has_am = tgetflag("am");
+ _mv_standout = tgetflag("ms");
+ if (tgetflag("bs")) {
+- if (BC == CNULL) BC = "\b";
++ if (mcBC == CNULL) mcBC = "\b";
+ }
+ else
+- BC = CNULL;
++ mcBC = CNULL;
+
+ /* Special IBM box-drawing characters */
+ D_UL = 201;