[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-715-gef16486
Brad King
brad.king at kitware.com
Tue Nov 18 10:07:42 EST 2014
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 ef164864bcc990f1c1bbc1ff69e4b8021b0586a7 (commit)
via 7a68729223c05d779188de89066de414d131dbcb (commit)
via 44f02b42fb3b2278fdf8e9bd450c3f01573d1e3e (commit)
via ee3d06a41ec6b5355083a3eba36cf73a5438c1c5 (commit)
from 469b2503bd0c57820542f6a23df58b00252de7b9 (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=ef164864bcc990f1c1bbc1ff69e4b8021b0586a7
commit ef164864bcc990f1c1bbc1ff69e4b8021b0586a7
Merge: 469b250 7a68729
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 18 10:07:41 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 18 10:07:41 2014 -0500
Merge topic 'ccmake-hpux' into next
7a687292 ccmake: Cleanup and simplify conditional blocks for HP-UX
44f02b42 ccmake: Use standard getmaxyx instead of non-standard getmax[xy]
ee3d06a4 ccmake: Remove incomplete support for cur_colr on old HP-UX
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a68729223c05d779188de89066de414d131dbcb
commit 7a68729223c05d779188de89066de414d131dbcb
Author: Ådne Hovda <ahovda at openit.com>
AuthorDate: Tue Nov 18 11:40:05 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 18 10:03:35 2014 -0500
ccmake: Cleanup and simplify conditional blocks for HP-UX
diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
index b157a28..791ac9b 100644
--- a/Source/CursesDialog/cmCursesStandardIncludes.h
+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
@@ -15,30 +15,13 @@
#define _MSE_INT_H
#endif
-#include <cmFormConfigure.h>
-
#if defined(__hpux)
# define _BOOL_DEFINED
# include <sys/time.h>
-# define _XOPEN_SOURCE_EXTENDED
-# include <curses.h>
-# include <form.h>
-# undef _XOPEN_SOURCE_EXTENDED
-#else
-/* figure out which curses.h to include */
-# if defined(CURSES_HAVE_NCURSES_H)
-# include <ncurses.h>
-# elif defined(CURSES_HAVE_NCURSES_NCURSES_H)
-# include <ncurses/ncurses.h>
-# elif defined(CURSES_HAVE_NCURSES_CURSES_H)
-# include <ncurses/curses.h>
-# else
-# include <curses.h>
-# endif
-
-# include <form.h>
#endif
+#include <form.h>
+
// This is a hack to prevent warnings about these functions being
// declared but not referenced.
#if defined(__sgi) && !defined(__GNUC__)
@@ -57,10 +40,6 @@ public:
};
#endif
-#ifndef getmaxyx
- #define getmaxyx(w,y,x) ((y) = getmaxy(w), (x) = getmaxx(w))
-#endif
-
// on some machines move erase and clear conflict with stl
// so remove them from the namespace
diff --git a/Source/CursesDialog/form/fld_attr.c b/Source/CursesDialog/form/fld_attr.c
index 8619588..35ea903 100644
--- a/Source/CursesDialog/form/fld_attr.c
+++ b/Source/CursesDialog/form/fld_attr.c
@@ -29,13 +29,7 @@
/****************************************************************************
* Author: Juergen Pfeifer <juergen.pfeifer at gmx.net> 1995,1997 *
****************************************************************************/
-#if defined(__hpux)
- #define _XOPEN_SOURCE_EXTENDED
-#endif
- #include "form.priv.h"
-#if defined(__hpux)
- #undef _XOPEN_SOURCE_EXTENDED
-#endif
+#include "form.priv.h"
MODULE_ID("$Id$")
/*----------------------------------------------------------------------------
diff --git a/Source/CursesDialog/form/form.h b/Source/CursesDialog/form/form.h
index 94f05af..1219cb5 100644
--- a/Source/CursesDialog/form/form.h
+++ b/Source/CursesDialog/form/form.h
@@ -47,7 +47,17 @@
# elif defined(CURSES_HAVE_NCURSES_CURSES_H)
# include <ncurses/curses.h>
# else
+# if defined(__hpux)
+# if defined(_XOPEN_SOURCE_EXTENDED)
+# define HAVE__XOPEN_SOURCE_EXTENDED
+# else
+# define _XOPEN_SOURCE_EXTENDED
+# endif
+# endif
# include <curses.h>
+# if defined(__hpux) && !defined(HAVE__XOPEN_SOURCE_EXTENDED)
+# undef _XOPEN_SOURCE_EXTENDED
+# endif
# endif
#include <eti.h>
diff --git a/Source/CursesDialog/form/frm_driver.c b/Source/CursesDialog/form/frm_driver.c
index db2ee50..26f580e 100644
--- a/Source/CursesDialog/form/frm_driver.c
+++ b/Source/CursesDialog/form/frm_driver.c
@@ -29,13 +29,7 @@
/****************************************************************************
* Author: Juergen Pfeifer <juergen.pfeifer at gmx.net> 1995,1997 *
****************************************************************************/
-#if defined(__hpux)
- #define _XOPEN_SOURCE_EXTENDED
-#endif
#include "form.priv.h"
-#if defined(__hpux)
- #undef _XOPEN_SOURCE_EXTENDED
-#endif
/* AIX seems to define this */
#undef lines
diff --git a/Source/CursesDialog/form/frm_req_name.c b/Source/CursesDialog/form/frm_req_name.c
index b108dab..6fb9183 100644
--- a/Source/CursesDialog/form/frm_req_name.c
+++ b/Source/CursesDialog/form/frm_req_name.c
@@ -35,13 +35,7 @@
* Routines to handle external names of menu requests *
***************************************************************************/
-#if defined(__hpux)
- #define _XOPEN_SOURCE_EXTENDED
-#endif
#include "form.priv.h"
-#if defined(__hpux)
- #undef _XOPEN_SOURCE_EXTENDED
-#endif
MODULE_ID("$Id$")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44f02b42fb3b2278fdf8e9bd450c3f01573d1e3e
commit 44f02b42fb3b2278fdf8e9bd450c3f01573d1e3e
Author: Ådne Hovda <ahovda at openit.com>
AuthorDate: Tue Nov 18 10:04:30 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 18 10:02:33 2014 -0500
ccmake: Use standard getmaxyx instead of non-standard getmax[xy]
Swap out getmax[xy]() calls for single call to getmaxyx(), to support
strict X/Open conformant curses implementations, e.g. HP-UX Xcurses.
diff --git a/Source/CursesDialog/form/form.priv.h b/Source/CursesDialog/form/form.priv.h
index 889c6e4..8516a6f 100644
--- a/Source/CursesDialog/form/form.priv.h
+++ b/Source/CursesDialog/form/form.priv.h
@@ -33,12 +33,6 @@
#include "mf_common.h"
#include "form.h"
-/* get around odd bug on aCC and itanium */
-#if defined(__hpux)
-#define getmaxx __getmaxx
-#define getmaxy __getmaxy
-#endif
-
/* form status values */
#define _OVLMODE (0x04) /* Form is in overlay mode */
#define _WINDOW_MODIFIED (0x10) /* Current field window has been modified */
diff --git a/Source/CursesDialog/form/frm_driver.c b/Source/CursesDialog/form/frm_driver.c
index b9611bf..db2ee50 100644
--- a/Source/CursesDialog/form/frm_driver.c
+++ b/Source/CursesDialog/form/frm_driver.c
@@ -357,12 +357,7 @@ 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;
@@ -394,17 +389,13 @@ static void Window_To_Buffer(WINDOW * win, FIELD * field)
int pad;
int len = 0;
char *p;
- int row, height;
+ int row, height, width;
assert(win && field && field->buf );
pad = field->pad;
p = field->buf;
-#if defined(__LSB_VERSION__)
- { int width; getmaxyx(win, height, width); }
-#else
- height = getmaxy(win);
-#endif
+ getmaxyx(win, height, width);
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 3c63de7..924fe6a 100644
--- a/Source/CursesDialog/form/frm_post.c
+++ b/Source/CursesDialog/form/frm_post.c
@@ -63,12 +63,7 @@ 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);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee3d06a41ec6b5355083a3eba36cf73a5438c1c5
commit ee3d06a41ec6b5355083a3eba36cf73a5438c1c5
Author: Ådne Hovda <ahovda at openit.com>
AuthorDate: Mon Nov 17 13:24:40 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 18 10:02:08 2014 -0500
ccmake: Remove incomplete support for cur_colr on old HP-UX
Enable support for the more modern Xcurses.
diff --git a/Source/CursesDialog/form/form.priv.h b/Source/CursesDialog/form/form.priv.h
index 3691f2f..889c6e4 100644
--- a/Source/CursesDialog/form/form.priv.h
+++ b/Source/CursesDialog/form/form.priv.h
@@ -34,7 +34,7 @@
#include "form.h"
/* get around odd bug on aCC and itanium */
-#if defined(__hpux) && defined(__ia64)
+#if defined(__hpux)
#define getmaxx __getmaxx
#define getmaxy __getmaxy
#endif
-----------------------------------------------------------------------
Summary of changes:
Source/CursesDialog/cmCursesStandardIncludes.h | 25 ++----------------------
Source/CursesDialog/form/fld_attr.c | 8 +-------
Source/CursesDialog/form/form.h | 10 ++++++++++
Source/CursesDialog/form/form.priv.h | 6 ------
Source/CursesDialog/form/frm_driver.c | 19 ++----------------
Source/CursesDialog/form/frm_post.c | 5 -----
Source/CursesDialog/form/frm_req_name.c | 6 ------
7 files changed, 15 insertions(+), 64 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list