diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1fa0ae6d72..12adcb4b86 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-09-17 14:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * bin/hb-func.sh + * source/rtl/gtcrs/gtcrs.c + * source/rtl/gtcrs/gtcrs.h + * config/detect.mk + - Deleted HB_NCURSES_194 references. + 2009-09-17 13:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/rtl/gtcrs/Makefile * source/rtl/gttrm/Makefile @@ -32,7 +39,7 @@ It should be replaced with HB_USER_CFLAGS=-DHB_NCURSES_194 ; TODO: Change logic in bin/hb-func.sh to lookup user flags for -DHB_NCURSES_194, instead of processing dedicated HB_NCURSES_194 variable. I'm unsure - which variable to check here for user flags. + which variable to check here for user flags. [SOLVED] 2009-09-17 13:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * bin/hb-func.sh diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 477347a29b..067821f59d 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -234,8 +234,6 @@ mk_hbtools() fi if [ -n "${HB_CURSES_VER}" ]; then HB_LIBNAME_CURSES="${HB_CURSES_VER}" - elif [ "${HB_NCURSES_194}" = "yes" ]; then - HB_LIBNAME_CURSES="ncur194" elif [ -z "${HB_LIBNAME_CURSES}" ]; then HB_LIBNAME_CURSES="ncurses" fi diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk index 406d3d15a6..8098cf8434 100644 --- a/harbour/config/detect.mk +++ b/harbour/config/detect.mk @@ -118,14 +118,9 @@ _DET_VAR_INC_ := HB_INC_CURSES _DET_VAR_HAS_ := HB_HAS_CURSES _DET_FLT_PLAT := !os2 _DET_FLT_COMP := -_DET_INC_DEFP := /boot/develop/headers/3rdparty +_DET_INC_DEFP := /usr/include /usr/local/include /sw/include /opt/local/include /boot/develop/headers/3rdparty _DET_INC_HEAD := /curses.h -ifneq ($(filter -DHB_NCURSES_194,$(HB_USER_CFLAGS)),) - _DET_INC_DEFP += /usr/include/ncur194 -else - _DET_INC_DEFP += /usr/include /usr/local/include /sw/include /opt/local/include -endif ifeq ($(HB_COMPILER),djgpp) _DET_INC_DEFP += $(foreach d, $(subst $(PTHSEP), ,$(PATH)), $(d)/../include) endif diff --git a/harbour/source/rtl/gtcrs/gtcrs.c b/harbour/source/rtl/gtcrs/gtcrs.c index 594c2a923f..46da3e9ec5 100644 --- a/harbour/source/rtl/gtcrs/gtcrs.c +++ b/harbour/source/rtl/gtcrs/gtcrs.c @@ -3058,7 +3058,7 @@ HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ ) /* *********************************************************************** */ -#if defined( HB_GT_CRS_BCEHACK ) && defined( NCURSES_VERSION ) && !defined( HB_NCURSES_194 ) +#if defined( HB_GT_CRS_BCEHACK ) && defined( NCURSES_VERSION ) #include static void curs_wrkaround( void ) { diff --git a/harbour/source/rtl/gtcrs/gtcrs.h b/harbour/source/rtl/gtcrs/gtcrs.h index 261f8dd1fd..ec8cdaf349 100644 --- a/harbour/source/rtl/gtcrs/gtcrs.h +++ b/harbour/source/rtl/gtcrs/gtcrs.h @@ -62,22 +62,15 @@ #include "hbapierr.h" #ifndef HB_CDP_SUPPORT_OFF -#include "hbapicdp.h" +# include "hbapicdp.h" #endif -#ifdef HB_NCURSES_194 -# include - extern int tigetflag(char *); - extern int tigetnum(char *); - extern char *tigetstr(char *); -#else -# if defined( HB_OS_HPUX ) -# define _XOPEN_SOURCE_EXTENDED -# endif -# include -# if defined( HB_OS_SUNOS ) || defined( __PDCURSES__ ) -# include -# endif +#if defined( HB_OS_HPUX ) +# define _XOPEN_SOURCE_EXTENDED +#endif +#include +#if defined( HB_OS_SUNOS ) || defined( __PDCURSES__ ) +# include #endif #if defined( HB_HAS_GPM ) # include