kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ccmake: Cleanup and simplify conditional blocks for HP-UX

This commit is contained in:
Ådne Hovda 2014-11-18 11:40:05 +01:00 committed by Brad King
parent 44f02b42fb
commit 7a68729223
5 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/CursesDialog/cmCursesStandardIncludes.h
View File

@ -15,29 +15,12 @@
#define _MSE_INT_H #define _MSE_INT_H
#endif #endif
#include <cmFormConfigure.h>
#if defined(__hpux) #if defined(__hpux)
# define _BOOL_DEFINED # define _BOOL_DEFINED
# include <sys/time.h> # 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 #endif
#include <form.h> #include <form.h>
#endif
// This is a hack to prevent warnings about these functions being // This is a hack to prevent warnings about these functions being
// declared but not referenced. // declared but not referenced.
@ -57,10 +40,6 @@ public:
}; };
#endif #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 // on some machines move erase and clear conflict with stl
// so remove them from the namespace // so remove them from the namespace

6
Source/CursesDialog/form/fld_attr.c
View File

@ -29,13 +29,7 @@
/**************************************************************************** /****************************************************************************
* Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1995,1997 * * Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1995,1997 *
****************************************************************************/ ****************************************************************************/
#if defined(__hpux)
#define _XOPEN_SOURCE_EXTENDED
#endif
#include "form.priv.h" #include "form.priv.h"
#if defined(__hpux)
#undef _XOPEN_SOURCE_EXTENDED
#endif
MODULE_ID("$Id$") MODULE_ID("$Id$")
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------

10
Source/CursesDialog/form/form.h
View File

@ -47,7 +47,17 @@
# elif defined(CURSES_HAVE_NCURSES_CURSES_H) # elif defined(CURSES_HAVE_NCURSES_CURSES_H)
# include <ncurses/curses.h> # include <ncurses/curses.h>
# else # else
# if defined(__hpux)
# if defined(_XOPEN_SOURCE_EXTENDED)
# define HAVE__XOPEN_SOURCE_EXTENDED
# else
# define _XOPEN_SOURCE_EXTENDED
# endif
# endif
# include <curses.h> # include <curses.h>
# if defined(__hpux) && !defined(HAVE__XOPEN_SOURCE_EXTENDED)
# undef _XOPEN_SOURCE_EXTENDED
# endif
# endif # endif
#include <eti.h> #include <eti.h>

6
Source/CursesDialog/form/frm_driver.c
View File

@ -29,13 +29,7 @@
/**************************************************************************** /****************************************************************************
* Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1995,1997 * * Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1995,1997 *
****************************************************************************/ ****************************************************************************/
#if defined(__hpux)
#define _XOPEN_SOURCE_EXTENDED
#endif
#include "form.priv.h" #include "form.priv.h"
#if defined(__hpux)
#undef _XOPEN_SOURCE_EXTENDED
#endif
/* AIX seems to define this */ /* AIX seems to define this */
#undef lines #undef lines

6
Source/CursesDialog/form/frm_req_name.c
View File

@ -35,13 +35,7 @@
* Routines to handle external names of menu requests * * Routines to handle external names of menu requests *
***************************************************************************/ ***************************************************************************/
#if defined(__hpux)
#define _XOPEN_SOURCE_EXTENDED
#endif
#include "form.priv.h" #include "form.priv.h"
#if defined(__hpux)
#undef _XOPEN_SOURCE_EXTENDED
#endif
MODULE_ID("$Id$") MODULE_ID("$Id$")