From 88e3cd53ab069aa8729cbc5905aa3a4112917e29 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Tue, 27 Jun 2006 09:57:02 -0400 Subject: [PATCH] ENH: fix ia64 build with aCC --- Source/CursesDialog/form/form.priv.h | 32 +++++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Source/CursesDialog/form/form.priv.h b/Source/CursesDialog/form/form.priv.h index 886121c94c..3691f2fd0c 100644 --- a/Source/CursesDialog/form/form.priv.h +++ b/Source/CursesDialog/form/form.priv.h @@ -33,6 +33,12 @@ #include "mf_common.h" #include "form.h" +/* get around odd bug on aCC and itanium */ +#if defined(__hpux) && defined(__ia64) +#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 */ @@ -41,7 +47,7 @@ /* field status values */ #define _CHANGED (0x01) /* Field has been changed */ #define _NEWTOP (0x02) /* Vertical scrolling occured */ -#define _NEWPAGE (0x04) /* field begins new page of form */ +#define _NEWPAGE (0x04) /* field begins new page of form */ #define _MAY_GROW (0x08) /* dynamic field may still grow */ /* fieldtype status values */ @@ -91,20 +97,20 @@ typedef struct typearg { #define FIRST_ACTIVE_MAGIC (-291056) #define ALL_FORM_OPTS ( \ - O_NL_OVERLOAD |\ - O_BS_OVERLOAD ) + O_NL_OVERLOAD |\ + O_BS_OVERLOAD ) #define ALL_FIELD_OPTS ( \ - O_VISIBLE |\ - O_ACTIVE |\ - O_PUBLIC |\ - O_EDIT |\ - O_WRAP |\ - O_BLANK |\ - O_AUTOSKIP|\ - O_NULLOK |\ - O_PASSOK |\ - O_STATIC ) + O_VISIBLE |\ + O_ACTIVE |\ + O_PUBLIC |\ + O_EDIT |\ + O_WRAP |\ + O_BLANK |\ + O_AUTOSKIP|\ + O_NULLOK |\ + O_PASSOK |\ + O_STATIC ) #define C_BLANK ' '