[Cmake-commits] CMake branch, next, updated. v2.8.3-1180-geb7aa73

[Brad King]

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  eb7aa7392e45c0bb0de117688ef7b033b0bad333 (commit)
       via  a3de30eed95cbcff75aeb654710f8b43a8dfa90d (commit)
      from  178864a13321fbe5d911dd56fc3216a4f350e755 (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=eb7aa7392e45c0bb0de117688ef7b033b0bad333
commit eb7aa7392e45c0bb0de117688ef7b033b0bad333
Merge: 178864a a3de30e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 4 08:53:30 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 4 08:53:30 2011 -0500

    Merge topic 'linux-standard-base' into next
    
    a3de30e ccmake: Use LSB 4.0 curses API conditionally


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3de30eed95cbcff75aeb654710f8b43a8dfa90d
commit a3de30eed95cbcff75aeb654710f8b43a8dfa90d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 4 08:52:50 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 4 08:52:50 2011 -0500

    ccmake: Use LSB 4.0 curses API conditionally
    
    Use of 'attr_t' and 'wattr_get' 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 519d66d..80f09d0 100644
--- a/Source/CursesDialog/form/frm_driver.c
+++ b/Source/CursesDialog/form/frm_driver.c
@@ -855,8 +855,6 @@ static int Display_Or_Erase_Field(FIELD * field, bool bEraseFlag)
 {
   WINDOW *win;
   WINDOW *fwin;
-  attr_t fwinAttrs;
-  short  fwinPair;
 
   if (!field)
     return E_SYSTEM_ERROR;
@@ -872,12 +870,17 @@ static int Display_Or_Erase_Field(FIELD * field, bool bEraseFlag)
       if (field->opts & O_VISIBLE)
         Set_Field_Window_Attributes(field,win);
       else
-      {
+        {
+#if defined(__LSB_VERSION__)
         /* getattrs() would be handy, but it is not part of LSB 4.0 */
-        /* wattrset(win,getattrs(fwin)); */
+        attr_t fwinAttrs;
+        short  fwinPair;
         wattr_get(fwin, &fwinAttrs, &fwinPair, 0);
         wattr_set(win, fwinAttrs, fwinPair, 0);
-      }
+#else
+        wattrset(win,getattrs(fwin));
+#endif
+        }
       werase(win);
     }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/CursesDialog/form/frm_driver.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake