This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via bd7384eef62693134fcd3cf210fb405c39b9b530 (commit)
via dde0c89cfcec22ac75cbadd77e45d2113521f326 (commit)
from f9cee6813610839f891d1b4d1b4e651a0d27edea (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd7384eef62693134fcd3cf210fb405c39b9b530
commit bd7384eef62693134fcd3cf210fb405c39b9b530
Merge: f9cee68 dde0c89
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 5 11:10:09 2011 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 5 11:10:09 2011 -0500
Merge topic 'linux-standard-base' into next
dde0c89 ccmake: Use LSB 4.0 getmaxyx conditionally
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dde0c89cfcec22ac75cbadd77e45d2113521f326
commit dde0c89cfcec22ac75cbadd77e45d2113521f326
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 5 11:07:24 2011 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 5 11:07:24 2011 -0500
ccmake: Use LSB 4.0 getmaxyx conditionally
Use of 'getmaxyx' works on LSB but does not seem portable to other
curses versions.
diff --git a/Source/CursesDialog/form/frm_driver.c
b/Source/CursesDialog/form/frm_driver.c
index 80f09d0..03896c2 100644
--- a/Source/CursesDialog/form/frm_driver.c
+++ b/Source/CursesDialog/form/frm_driver.c
@@ -357,7 +357,12 @@ static void Buffer_To_Window(const FIELD * field, WINDOW
* win)
assert(win && field);
+#if defined(__LSB_VERSION__)
getmaxyx(win, height, width);
+#else
+ width = getmaxx(win);
+ height = getmaxy(win);
+#endif
for(row=0, pBuffer=field->buf;
row < height;
@@ -389,13 +394,17 @@ static void Window_To_Buffer(WINDOW * win, FIELD * field)
int pad;
int len = 0;
char *p;
- int row, height, width;
+ int row, height;
assert(win && field && field->buf );
pad = field->pad;
p = field->buf;
- getmaxyx(win, height, width);
+#if defined(__LSB_VERSION__)
+ { int width; getmaxyx(win, height, width); }
+#else
+ height = getmaxy(win);
+#endif
for(row=0; (row < height) && (row < field->drows); row++ )
{
diff --git a/Source/CursesDialog/form/frm_post.c
b/Source/CursesDialog/form/frm_post.c
index 924fe6a..3c63de7 100644
--- a/Source/CursesDialog/form/frm_post.c
+++ b/Source/CursesDialog/form/frm_post.c
@@ -63,7 +63,12 @@ int post_form(FORM * form)
RETURN(E_NOT_CONNECTED);
formwin = Get_Form_Window(form);
+#if defined(__LSB_VERSION__)
getmaxyx(formwin, height, width);
+#else
+ width = getmaxx(formwin);
+ height = getmaxy(formwin);
+#endif
if ((form->cols > width) || (form->rows > height))
RETURN(E_NO_ROOM);
-----------------------------------------------------------------------
Summary of changes:
Source/CursesDialog/form/frm_driver.c | 13 +++++++++++--
Source/CursesDialog/form/frm_post.c | 5 +++++
2 files changed, 16 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
