aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--terms.c10
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 39f1f1e..12209c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2001-12-26 Fumitoshi UKAI <ukai@debian.or.jp>
+ * [#496613] LASTLINE in terms.c
+ by Kazuhiro NISHIYAMA (znz)
+ * terms.c (LASTLINE): defined(__CYGWIN__) instead of defined(CYGWIN)
+ * terms.c (setlinescols): ditto
+
+2001-12-26 Fumitoshi UKAI <ukai@debian.or.jp>
+
* [#496610] #include <sys/wait.h>
by Kazuhiro NISHIYAMA (znz)
* main.c: #if defined(HAVE_WAITPID) || defined(HAVE_WAIT3)
@@ -1556,4 +1563,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.174 2001/12/25 16:49:42 ukai Exp $
+$Id: ChangeLog,v 1.175 2001/12/25 16:54:45 ukai Exp $
diff --git a/terms.c b/terms.c
index 3ce3ef8..fbe9815 100644
--- a/terms.c
+++ b/terms.c
@@ -1,4 +1,4 @@
-/* $Id: terms.c,v 1.26 2001/12/25 12:41:08 ukai Exp $ */
+/* $Id: terms.c,v 1.27 2001/12/25 16:54:45 ukai Exp $ */
/*
* An original curses library for EUC-kanji by Akinori ITO, December 1989
* revised by Akinori ITO, January 1995
@@ -435,9 +435,9 @@ char *T_cd, *T_ce, *T_kr, *T_kl, *T_cr, *T_bt, *T_ta, *T_sc, *T_rc,
*T_ti, *T_te, *T_nd, *T_as, *T_ae, *T_eA, *T_ac, *T_op;
int LINES, COLS;
-#if defined(CYGWIN) && LANG == JA
+#if defined(__CYGWIN__) && LANG == JA
int LASTLINE;
-#endif /* defined(CYGWIN) && LANG == JA */
+#endif /* defined(__CYGWIN__) && LANG == JA */
static int max_LINES = 0, max_COLS = 0;
static int tab_step = 8;
static int CurLine, CurColumn;
@@ -794,9 +794,9 @@ setlinescols(void)
COLS = MAX_COLUMN;
if (LINES > MAX_LINE)
LINES = MAX_LINE;
-#if defined(CYGWIN) && LANG == JA
+#if defined(__CYGWIN__) && LANG == JA
LASTLINE = LINES - (isWinConsole ? 2 : 1);
-#endif /* defined(CYGWIN) && LANG == JA */
+#endif /* defined(__CYGWIN__) && LANG == JA */
}
void