From 56267f28ddafb683879ccbb4db565d3b4e7b9772 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 14 Apr 2007 10:41:54 +0000 Subject: [PATCH] 2007-04-14 12:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * harbour/include/hbstdgen.ch * harbour/include/box.ch * harbour/include/hbclass.ch * harbour/include/hbcommon.ch * harbour/include/hbextern.ch * harbour/include/hbgetcmt.ch * harbour/include/hbsetup.ch * harbour/include/ord.ch * harbour/source/rdd/dbdelim.prg * harbour/source/rdd/dbfuncs.prg * harbour/source/rdd/dbjoin.prg * harbour/source/rdd/dblist.prg * harbour/source/rdd/dbsort.prg * harbour/source/rdd/dbstrux.prg * harbour/source/rdd/dbtotal.prg * harbour/source/rdd/dbupdat.prg * harbour/source/rdd/rddord.prg * harbour/source/rtl/alert.prg * harbour/source/rtl/browdb.prg * harbour/source/rtl/browdbx.prg * harbour/source/rtl/checkbox.prg * harbour/source/rtl/dircmd.prg * harbour/source/rtl/getsys.prg * harbour/source/rtl/input.prg * harbour/source/rtl/mssgline.prg * harbour/source/rtl/pushbtn.prg * harbour/source/rtl/radiobtn.prg * harbour/source/rtl/radiogrp.prg * harbour/source/rtl/setfunc.prg * harbour/source/rtl/setta.prg * harbour/source/rtl/tbcolumn.prg * harbour/source/rtl/tget.prg * harbour/source/rtl/tgetint.prg * harbour/source/rtl/tmenuitm.prg * harbour/source/rtl/tpopup.prg * harbour/source/rtl/ttopbar.prg * harbour/source/rtl/typefile.prg * harbour/source/vm/harbinit.prg * harbour/utils/hbrun/external.prg * harbour/utils/hbtest/rt_main.ch + Following #defines are now available by default without the need to #include "hbsetup.ch". These are of course also available for applications as defined at Harbour build time: HB_EXTENSION HB_C52_UNDOC HB_C52_STRICT HB_COMPAT_C53 HB_COMPAT_XPP HB_COMPAT_VO HB_COMPAT_FLAGSHIP HB_COMPAT_FOXPRO HB_COMPAT_DBASE HB_COMPAT_CLIP HB_COMPAT_XHB HB_SHORTNAMES HB_FILE_VER_STATIC * harbour/source/compiler/hbusage.c * Mail address update. --- harbour/ChangeLog | 62 +++++++++++++++++++++++++++++++ harbour/include/box.ch | 3 -- harbour/include/hbclass.ch | 1 - harbour/include/hbcommon.ch | 2 - harbour/include/hbextern.ch | 8 ++-- harbour/include/hbgetcmt.ch | 2 - harbour/include/hbsetup.ch | 3 +- harbour/include/hbstdgen.ch | 17 --------- harbour/include/ord.ch | 3 +- harbour/source/compiler/hbusage.c | 2 +- harbour/source/rdd/dbdelim.prg | 2 - harbour/source/rdd/dbfuncs.prg | 2 - harbour/source/rdd/dbjoin.prg | 2 - harbour/source/rdd/dblist.prg | 2 - harbour/source/rdd/dbsort.prg | 2 - harbour/source/rdd/dbstrux.prg | 2 - harbour/source/rdd/dbtotal.prg | 2 - harbour/source/rdd/dbupdat.prg | 2 - harbour/source/rdd/rddord.prg | 2 - harbour/source/rtl/alert.prg | 2 - harbour/source/rtl/browdb.prg | 2 - harbour/source/rtl/browdbx.prg | 2 - harbour/source/rtl/checkbox.prg | 1 - harbour/source/rtl/dircmd.prg | 2 - harbour/source/rtl/getsys.prg | 1 - harbour/source/rtl/input.prg | 3 -- harbour/source/rtl/mssgline.prg | 1 - harbour/source/rtl/pushbtn.prg | 1 - harbour/source/rtl/radiobtn.prg | 1 - harbour/source/rtl/radiogrp.prg | 1 - harbour/source/rtl/setfunc.prg | 1 - harbour/source/rtl/setta.prg | 2 - harbour/source/rtl/tbcolumn.prg | 1 - harbour/source/rtl/tget.prg | 1 - harbour/source/rtl/tgetint.prg | 1 - harbour/source/rtl/tmenuitm.prg | 1 - harbour/source/rtl/tpopup.prg | 1 - harbour/source/rtl/ttopbar.prg | 1 - harbour/source/rtl/typefile.prg | 2 - harbour/source/vm/harbinit.prg | 1 - harbour/utils/hbrun/external.prg | 2 - harbour/utils/hbtest/rt_main.ch | 4 +- 42 files changed, 70 insertions(+), 86 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fc0822d311..92fa39d31b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,68 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-04-14 12:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * harbour/include/hbstdgen.ch + * harbour/include/box.ch + * harbour/include/hbclass.ch + * harbour/include/hbcommon.ch + * harbour/include/hbextern.ch + * harbour/include/hbgetcmt.ch + * harbour/include/hbsetup.ch + * harbour/include/ord.ch + * harbour/source/rdd/dbdelim.prg + * harbour/source/rdd/dbfuncs.prg + * harbour/source/rdd/dbjoin.prg + * harbour/source/rdd/dblist.prg + * harbour/source/rdd/dbsort.prg + * harbour/source/rdd/dbstrux.prg + * harbour/source/rdd/dbtotal.prg + * harbour/source/rdd/dbupdat.prg + * harbour/source/rdd/rddord.prg + * harbour/source/rtl/alert.prg + * harbour/source/rtl/browdb.prg + * harbour/source/rtl/browdbx.prg + * harbour/source/rtl/checkbox.prg + * harbour/source/rtl/dircmd.prg + * harbour/source/rtl/getsys.prg + * harbour/source/rtl/input.prg + * harbour/source/rtl/mssgline.prg + * harbour/source/rtl/pushbtn.prg + * harbour/source/rtl/radiobtn.prg + * harbour/source/rtl/radiogrp.prg + * harbour/source/rtl/setfunc.prg + * harbour/source/rtl/setta.prg + * harbour/source/rtl/tbcolumn.prg + * harbour/source/rtl/tget.prg + * harbour/source/rtl/tgetint.prg + * harbour/source/rtl/tmenuitm.prg + * harbour/source/rtl/tpopup.prg + * harbour/source/rtl/ttopbar.prg + * harbour/source/rtl/typefile.prg + * harbour/source/vm/harbinit.prg + * harbour/utils/hbrun/external.prg + * harbour/utils/hbtest/rt_main.ch + + Following #defines are now available by default without + the need to #include "hbsetup.ch". These are of course + also available for applications as defined at Harbour + build time: + HB_EXTENSION + HB_C52_UNDOC + HB_C52_STRICT + HB_COMPAT_C53 + HB_COMPAT_XPP + HB_COMPAT_VO + HB_COMPAT_FLAGSHIP + HB_COMPAT_FOXPRO + HB_COMPAT_DBASE + HB_COMPAT_CLIP + HB_COMPAT_XHB + HB_SHORTNAMES + HB_FILE_VER_STATIC + + * harbour/source/compiler/hbusage.c + * Mail address update. + 2007-04-14 11:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * harbour/source/debug/dbgtarr.prg ! Fixed unclosed #if construct. diff --git a/harbour/include/box.ch b/harbour/include/box.ch index 0106d6c793..3dc6f432ae 100644 --- a/harbour/include/box.ch +++ b/harbour/include/box.ch @@ -53,8 +53,6 @@ #ifndef _BOX_CH #define _BOX_CH -#include "hbsetup.ch" - /* #defines for DISPBOX() */ /* Single-line */ @@ -84,4 +82,3 @@ #endif #endif /* _BOX_CH */ - diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch index 28079835ec..643bc54350 100644 --- a/harbour/include/hbclass.ch +++ b/harbour/include/hbclass.ch @@ -73,7 +73,6 @@ #ifndef HB_CLASS_CH_ #define HB_CLASS_CH_ -#include "hbsetup.ch" #include "hboo.ch" /* You can actually define one or all the syntax, they do not collide each other */ diff --git a/harbour/include/hbcommon.ch b/harbour/include/hbcommon.ch index b5bf9af226..af86469107 100644 --- a/harbour/include/hbcommon.ch +++ b/harbour/include/hbcommon.ch @@ -53,8 +53,6 @@ #ifndef HB_HBCOMMON_CH_ #define HB_HBCOMMON_CH_ -#include "hbsetup.ch" - #ifdef HB_FILE_VER_STATIC #define HB_FILE_VER( id ) STATIC s_hb_file_ver := id #else diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index cb1cb0ef67..14c172e898 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -53,8 +53,6 @@ #ifndef HB_EXTERN_CH_ #define HB_EXTERN_CH_ -#include "hbsetup.ch" - /* CA-Cl*pper compatible standard functions */ EXTERNAL AADD @@ -169,9 +167,9 @@ EXTERNAL FIELDNAME EXTERNAL FIELDPOS EXTERNAL FIELDPUT #ifdef HB_EXTENSION -EXTERNAL FIELDLEN /* harbour extension */ -EXTERNAL FIELDDEC /* harbour extension */ -EXTERNAL FIELDTYPE /* harbour extension */ +EXTERNAL FIELDLEN +EXTERNAL FIELDDEC +EXTERNAL FIELDTYPE #endif EXTERNAL FIELDWBLOCK EXTERNAL FILE diff --git a/harbour/include/hbgetcmt.ch b/harbour/include/hbgetcmt.ch index 2791f66a70..e7a2b449f4 100644 --- a/harbour/include/hbgetcmt.ch +++ b/harbour/include/hbgetcmt.ch @@ -53,8 +53,6 @@ #ifndef HB_GETCMT_CH_ #define HB_GETCMT_CH_ -#include "hbsetup.ch" - #ifdef HB_COMPAT_C53 #command @ , GET ; diff --git a/harbour/include/hbsetup.ch b/harbour/include/hbsetup.ch index 08343c236f..8ff5a6a197 100644 --- a/harbour/include/hbsetup.ch +++ b/harbour/include/hbsetup.ch @@ -50,7 +50,8 @@ * */ -/* NOTE: This file is also used by C code. */ +/* NOTE: This file is used by C code and at Harbour build time. + Normally you never need to #include it in any .prg code. */ #ifndef HB_SETUP_CH_ #define HB_SETUP_CH_ diff --git a/harbour/include/hbstdgen.ch b/harbour/include/hbstdgen.ch index fed164e2ef..106b343f8d 100644 --- a/harbour/include/hbstdgen.ch +++ b/harbour/include/hbstdgen.ch @@ -58,23 +58,6 @@ /* undefine all rules which are not necessary in default PP tables */ #undef HB_SETUP_CH_ -#undef HB_EXTENSION - -#undef HB_C52_UNDOC -#undef HB_C52_STRICT - -#undef HB_COMPAT_C53 -#undef HB_COMPAT_XPP -#undef HB_COMPAT_VO -#undef HB_COMPAT_FLAGSHIP -#undef HB_COMPAT_FOXPRO -#undef HB_COMPAT_DBASE -#undef HB_COMPAT_CLIP -#undef HB_COMPAT_XHB - -#undef HB_SHORTNAMES -#undef HB_FILE_VER_STATIC - #undef __HARBOUR__ #undef __DATE__ #undef __TIME__ diff --git a/harbour/include/ord.ch b/harbour/include/ord.ch index 389cfda8e1..ee8632eb6e 100644 --- a/harbour/include/ord.ch +++ b/harbour/include/ord.ch @@ -80,7 +80,7 @@ * This pseudofunction is only document in CL5.3 NG but not implemented * in Clipper */ -#include "hbsetup.ch" + #ifdef HB_COMPAT_C53 #xtranslate ORDCOND( [FOR ] ; @@ -96,7 +96,6 @@ #endif - #include "dbinfo.ch" #endif /* HB_ORD_CH_ */ diff --git a/harbour/source/compiler/hbusage.c b/harbour/source/compiler/hbusage.c index d9f250ef28..106b2e854a 100644 --- a/harbour/source/compiler/hbusage.c +++ b/harbour/source/compiler/hbusage.c @@ -180,7 +180,7 @@ void hb_compPrintCredits( void ) "Ron Pinkas \n" "Ryszard Glab \n" "Tim Stone \n" - "Viktor Szakats \n" + "Viktor Szakats \n" "Vladimir Kazimirchik \n" ); } diff --git a/harbour/source/rdd/dbdelim.prg b/harbour/source/rdd/dbdelim.prg index 7474b0dede..4de84752d0 100644 --- a/harbour/source/rdd/dbdelim.prg +++ b/harbour/source/rdd/dbdelim.prg @@ -56,8 +56,6 @@ * */ -#include "hbsetup.ch" - REQUEST DELIM FUNCTION __dbDelim( lExport, cFile, cDelimArg, aFields, bFor, bWhile, nNext, nRecord, lRest ) diff --git a/harbour/source/rdd/dbfuncs.prg b/harbour/source/rdd/dbfuncs.prg index 52c6472602..c7a5043bc0 100644 --- a/harbour/source/rdd/dbfuncs.prg +++ b/harbour/source/rdd/dbfuncs.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - /* short (10 chars long) version of some functions for compatibility */ FUNCTION dbClearFil() diff --git a/harbour/source/rdd/dbjoin.prg b/harbour/source/rdd/dbjoin.prg index c2d75ea219..122ec26fe8 100644 --- a/harbour/source/rdd/dbjoin.prg +++ b/harbour/source/rdd/dbjoin.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - #include "dbstruct.ch" /* NOTE: Compared to CA-Cl*pper, Harbour has three extra parameters diff --git a/harbour/source/rdd/dblist.prg b/harbour/source/rdd/dblist.prg index feddbb83dc..74e0353840 100644 --- a/harbour/source/rdd/dblist.prg +++ b/harbour/source/rdd/dblist.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - /* NOTE: lAll is a dummy parameter, nothing seems to depend on it. [vszakats] */ PROCEDURE __dbList( lOff, abEval, lAll, bFor, bWhile, nNext, nRecord, lRest, lToPrint, cToFileName ) diff --git a/harbour/source/rdd/dbsort.prg b/harbour/source/rdd/dbsort.prg index 2b03e9d8ee..f1954dd3ea 100644 --- a/harbour/source/rdd/dbsort.prg +++ b/harbour/source/rdd/dbsort.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - /* NOTE: Compared to CA-Cl*pper, Harbour has three extra parameters (cRDD, nConnection, cCodePage). */ diff --git a/harbour/source/rdd/dbstrux.prg b/harbour/source/rdd/dbstrux.prg index df475b4e30..b70b7fd0eb 100644 --- a/harbour/source/rdd/dbstrux.prg +++ b/harbour/source/rdd/dbstrux.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - #include "common.ch" #include "dbstruct.ch" diff --git a/harbour/source/rdd/dbtotal.prg b/harbour/source/rdd/dbtotal.prg index 1c3a7654e4..23b8be98e3 100644 --- a/harbour/source/rdd/dbtotal.prg +++ b/harbour/source/rdd/dbtotal.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - #include "common.ch" #include "dbstruct.ch" #include "error.ch" diff --git a/harbour/source/rdd/dbupdat.prg b/harbour/source/rdd/dbupdat.prg index 17cf5f84dd..cbc69613c4 100644 --- a/harbour/source/rdd/dbupdat.prg +++ b/harbour/source/rdd/dbupdat.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - #include "common.ch" FUNCTION __dbUpdate( cAlias, bKey, lRandom, bAssign ) diff --git a/harbour/source/rdd/rddord.prg b/harbour/source/rdd/rddord.prg index 7817fe18bc..a900911488 100644 --- a/harbour/source/rdd/rddord.prg +++ b/harbour/source/rdd/rddord.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - #include "common.ch" #include "dbinfo.ch" diff --git a/harbour/source/rtl/alert.prg b/harbour/source/rtl/alert.prg index 750566e599..9f8c14e1e1 100644 --- a/harbour/source/rtl/alert.prg +++ b/harbour/source/rtl/alert.prg @@ -23,8 +23,6 @@ * */ -#include "hbsetup.ch" - #include "box.ch" #include "common.ch" #include "inkey.ch" diff --git a/harbour/source/rtl/browdb.prg b/harbour/source/rtl/browdb.prg index d72ed8d8d9..70ac5c794a 100644 --- a/harbour/source/rtl/browdb.prg +++ b/harbour/source/rtl/browdb.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - FUNCTION TBrowseDB( nTop, nLeft, nBottom, nRight ) LOCAL oBrowse := TBrowseNew( nTop, nLeft, nBottom, nRight ) diff --git a/harbour/source/rtl/browdbx.prg b/harbour/source/rtl/browdbx.prg index 4fd6f2cabd..b910d65804 100644 --- a/harbour/source/rtl/browdbx.prg +++ b/harbour/source/rtl/browdbx.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - /* NOTE: Xbase++ has a standard function named dbSkipper(), it's not a standard CA-Cl*pper 5.x function, though. */ diff --git a/harbour/source/rtl/checkbox.prg b/harbour/source/rtl/checkbox.prg index 1043644164..f9ce006d4f 100644 --- a/harbour/source/rtl/checkbox.prg +++ b/harbour/source/rtl/checkbox.prg @@ -51,7 +51,6 @@ */ #include "common.ch" -#include "hbsetup.ch" #include "hbclass.ch" #include "button.ch" diff --git a/harbour/source/rtl/dircmd.prg b/harbour/source/rtl/dircmd.prg index 2eb77f61ee..c5c8caec32 100644 --- a/harbour/source/rtl/dircmd.prg +++ b/harbour/source/rtl/dircmd.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - #include "directry.ch" #include "fileio.ch" diff --git a/harbour/source/rtl/getsys.prg b/harbour/source/rtl/getsys.prg index 00675ea762..6ecb998329 100644 --- a/harbour/source/rtl/getsys.prg +++ b/harbour/source/rtl/getsys.prg @@ -62,7 +62,6 @@ */ #include "common.ch" -#include "hbsetup.ch" #ifdef HB_COMPAT_C53 FUNCTION ReadModal( GetList, nPos, nMsgRow, nMsgLeft, nMsgRight, cMsgColor ) diff --git a/harbour/source/rtl/input.prg b/harbour/source/rtl/input.prg index c08d32e584..c0babe7d44 100644 --- a/harbour/source/rtl/input.prg +++ b/harbour/source/rtl/input.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - #ifdef HB_C52_UNDOC FUNCTION __Input( xPrompt ) @@ -60,4 +58,3 @@ FUNCTION __Input( xPrompt ) RETURN iif( Empty( cString ), NIL, &cString ) #endif - diff --git a/harbour/source/rtl/mssgline.prg b/harbour/source/rtl/mssgline.prg index 51f75faf3a..0628b9c3ce 100644 --- a/harbour/source/rtl/mssgline.prg +++ b/harbour/source/rtl/mssgline.prg @@ -50,7 +50,6 @@ * */ -#include "hbsetup.ch" #include "hbclass.ch" #ifdef HB_COMPAT_C53 diff --git a/harbour/source/rtl/pushbtn.prg b/harbour/source/rtl/pushbtn.prg index cd536bcc2b..1f5ad34ddd 100644 --- a/harbour/source/rtl/pushbtn.prg +++ b/harbour/source/rtl/pushbtn.prg @@ -50,7 +50,6 @@ * */ -#include 'hbsetup.ch' #include 'hbclass.ch' #include "common.ch" diff --git a/harbour/source/rtl/radiobtn.prg b/harbour/source/rtl/radiobtn.prg index 0615d80fd2..d0a66aa5b2 100644 --- a/harbour/source/rtl/radiobtn.prg +++ b/harbour/source/rtl/radiobtn.prg @@ -53,7 +53,6 @@ #include "common.ch" #include "hbclass.ch" -#include "hbsetup.ch" #ifdef HB_COMPAT_C53 CLASS HBRadioButton diff --git a/harbour/source/rtl/radiogrp.prg b/harbour/source/rtl/radiogrp.prg index c0785a00eb..8e099ebd41 100644 --- a/harbour/source/rtl/radiogrp.prg +++ b/harbour/source/rtl/radiogrp.prg @@ -52,7 +52,6 @@ #include "common.ch" #include "hbclass.ch" -#include "hbsetup.ch" #ifdef HB_COMPAT_C53 CLASS HBRadioGroup diff --git a/harbour/source/rtl/setfunc.prg b/harbour/source/rtl/setfunc.prg index 808ccca918..f407ff679b 100644 --- a/harbour/source/rtl/setfunc.prg +++ b/harbour/source/rtl/setfunc.prg @@ -52,7 +52,6 @@ #include "inkey.ch" #include "common.ch" -#include "hbsetup.ch" PROCEDURE __SetFunction( nFunctionKey, cString ) diff --git a/harbour/source/rtl/setta.prg b/harbour/source/rtl/setta.prg index b31b63bc21..f99f50aa0d 100644 --- a/harbour/source/rtl/setta.prg +++ b/harbour/source/rtl/setta.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - #ifdef HB_C52_UNDOC FUNCTION SetTypeahead( nSize ) diff --git a/harbour/source/rtl/tbcolumn.prg b/harbour/source/rtl/tbcolumn.prg index d2ebe9f458..f526531463 100644 --- a/harbour/source/rtl/tbcolumn.prg +++ b/harbour/source/rtl/tbcolumn.prg @@ -51,7 +51,6 @@ */ #include "hbclass.ch" -#include "hbsetup.ch" #include "common.ch" #include "tbrowse.ch" diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg index 4ac30e2983..96bf3249d3 100644 --- a/harbour/source/rtl/tget.prg +++ b/harbour/source/rtl/tget.prg @@ -51,7 +51,6 @@ */ #include "hbclass.ch" -#include "hbsetup.ch" #include "color.ch" #include "common.ch" diff --git a/harbour/source/rtl/tgetint.prg b/harbour/source/rtl/tgetint.prg index 8dc77715bc..9909320e99 100644 --- a/harbour/source/rtl/tgetint.prg +++ b/harbour/source/rtl/tgetint.prg @@ -58,7 +58,6 @@ */ #include "hbclass.ch" -#include "hbsetup.ch" REQUEST HB_PVALUE REQUEST PCOUNT diff --git a/harbour/source/rtl/tmenuitm.prg b/harbour/source/rtl/tmenuitm.prg index 4c39980712..9381fedaf4 100644 --- a/harbour/source/rtl/tmenuitm.prg +++ b/harbour/source/rtl/tmenuitm.prg @@ -52,7 +52,6 @@ #include "common.ch" #include "button.ch" -#include "hbsetup.ch" #ifdef HB_COMPAT_C53 diff --git a/harbour/source/rtl/tpopup.prg b/harbour/source/rtl/tpopup.prg index 8006f2b906..5e81773bb3 100644 --- a/harbour/source/rtl/tpopup.prg +++ b/harbour/source/rtl/tpopup.prg @@ -54,7 +54,6 @@ #include "button.ch" #include "color.ch" #include "common.ch" -#include "hbsetup.ch" #ifdef HB_COMPAT_C53 diff --git a/harbour/source/rtl/ttopbar.prg b/harbour/source/rtl/ttopbar.prg index 356056849e..db6a9b229b 100644 --- a/harbour/source/rtl/ttopbar.prg +++ b/harbour/source/rtl/ttopbar.prg @@ -57,7 +57,6 @@ #include "inkey.ch" #include "setcurs.ch" #include "getexit.ch" -#include "hbsetup.ch" #include "hbclass.ch" #ifdef HB_COMPAT_C53 diff --git a/harbour/source/rtl/typefile.prg b/harbour/source/rtl/typefile.prg index f6f8215cd8..1d78c5782f 100644 --- a/harbour/source/rtl/typefile.prg +++ b/harbour/source/rtl/typefile.prg @@ -50,8 +50,6 @@ * */ -#include "hbsetup.ch" - #include "common.ch" #include "error.ch" #include "fileio.ch" diff --git a/harbour/source/vm/harbinit.prg b/harbour/source/vm/harbinit.prg index 079cc0d1fb..2bdc5e24c4 100644 --- a/harbour/source/vm/harbinit.prg +++ b/harbour/source/vm/harbinit.prg @@ -50,7 +50,6 @@ * */ -#include "hbsetup.ch" #include "inkey.ch" ANNOUNCE SysInit diff --git a/harbour/utils/hbrun/external.prg b/harbour/utils/hbrun/external.prg index 5c42dfa3b0..2887fffacc 100644 --- a/harbour/utils/hbrun/external.prg +++ b/harbour/utils/hbrun/external.prg @@ -50,7 +50,5 @@ * */ -#include "hbsetup.ch" - /* Fill it as needed */ diff --git a/harbour/utils/hbtest/rt_main.ch b/harbour/utils/hbtest/rt_main.ch index 5be1e08aea..0a95c589a9 100644 --- a/harbour/utils/hbtest/rt_main.ch +++ b/harbour/utils/hbtest/rt_main.ch @@ -68,9 +68,7 @@ #define TEST_RESULT_COL4_WIDTH 85 #define TEST_RESULT_COL5_WIDTH 85 -#ifdef __HARBOUR__ - #include "hbsetup.ch" -#else +#ifndef __HARBOUR__ #define HB_C52_STRICT #endif