From 897a02e44ae8ef5b7167c0e4e6a1e0deaed84cf1 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 10 Feb 2009 00:47:50 +0000 Subject: [PATCH] 2009-02-10 01:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * doc/whatsnew.txt * include/clipdefs.h * include/filesys.api * include/gt.api * include/hbapi.h * include/hbapierr.h * include/hbapifs.h * include/hbapigt.h * include/hbapiitm.h * include/hbapirdd.h * include/hbdefs.h * include/hbgfxdef.ch * include/hbgtinfo.ch * include/hbsetup.ch * include/hbsetup.h * include/item.api * include/rdd.api * source/rtl/errorapi.c * source/rtl/filesys.c * source/vm/cmdarg.c * common.mak - source/vm/debugold.c * source/vm/Makefile * source/vm/vmmt/Makefile - Permanently disabled HB_LEGACY_LEVEL support. + Added HB_LEGACY_LEVEL2 support to protect some recently made incompatible changes. Old methods are supported until Harbour 1.2. Please update your code until then. To test your code for compatibility with recent changes, you can turn off legacy support manually by #defining HB_LEGACY_OFF. (HB_USER_CFLAGS=-DHB_LEGACY_OFF) This is recommended on local systems for all Harbour developers. --- harbour/ChangeLog | 36 ++++++++ harbour/common.mak | 1 - harbour/doc/whatsnew.txt | 8 ++ harbour/include/clipdefs.h | 4 + harbour/include/filesys.api | 2 - harbour/include/gt.api | 2 - harbour/include/hbapi.h | 8 +- harbour/include/hbapierr.h | 6 -- harbour/include/hbapifs.h | 5 -- harbour/include/hbapigt.h | 4 - harbour/include/hbapiitm.h | 6 -- harbour/include/hbapirdd.h | 7 -- harbour/include/hbdefs.h | 10 +-- harbour/include/hbgfxdef.ch | 31 ------- harbour/include/hbgtinfo.ch | 83 ------------------ harbour/include/hbsetup.ch | 14 +-- harbour/include/hbsetup.h | 17 ++-- harbour/include/item.api | 2 - harbour/include/rdd.api | 5 ++ harbour/source/rtl/errorapi.c | 5 -- harbour/source/rtl/filesys.c | 19 ----- harbour/source/vm/Makefile | 1 - harbour/source/vm/cmdarg.c | 27 ++---- harbour/source/vm/debugold.c | 145 -------------------------------- harbour/source/vm/vmmt/Makefile | 1 - 25 files changed, 81 insertions(+), 368 deletions(-) delete mode 100644 harbour/source/vm/debugold.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0b96b86e25..43a944003e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,42 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-02-10 01:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * doc/whatsnew.txt + * include/clipdefs.h + * include/filesys.api + * include/gt.api + * include/hbapi.h + * include/hbapierr.h + * include/hbapifs.h + * include/hbapigt.h + * include/hbapiitm.h + * include/hbapirdd.h + * include/hbdefs.h + * include/hbgfxdef.ch + * include/hbgtinfo.ch + * include/hbsetup.ch + * include/hbsetup.h + * include/item.api + * include/rdd.api + * source/rtl/errorapi.c + * source/rtl/filesys.c + * source/vm/cmdarg.c + * common.mak + - source/vm/debugold.c + * source/vm/Makefile + * source/vm/vmmt/Makefile + - Permanently disabled HB_LEGACY_LEVEL support. + + Added HB_LEGACY_LEVEL2 support to protect some + recently made incompatible changes. Old methods + are supported until Harbour 1.2. Please update + your code until then. To test your code for + compatibility with recent changes, you can turn + off legacy support manually by #defining HB_LEGACY_OFF. + (HB_USER_CFLAGS=-DHB_LEGACY_OFF) + This is recommended on local systems for all + Harbour developers. + 2009-02-10 01:38 UTC+0100 Francesco Saverio Giudice (info/at/fsgiudice.com) * harbour/contrib/examples/uhttpd/uhttpd.prg * Updated uHTTPD (Work in progress) diff --git a/harbour/common.mak b/harbour/common.mak index b27ed71ca5..5f8d7be0e7 100644 --- a/harbour/common.mak +++ b/harbour/common.mak @@ -431,7 +431,6 @@ VM_COMMON_LIB_OBJS = \ $(OBJ_DIR)\cmdarg$(OBJEXT) \ $(OBJ_DIR)\codebloc$(OBJEXT) \ $(OBJ_DIR)\debug$(OBJEXT) \ - $(OBJ_DIR)\debugold$(OBJEXT) \ $(OBJ_DIR)\dynlibhb$(OBJEXT) \ $(OBJ_DIR)\dynsym$(OBJEXT) \ $(OBJ_DIR)\estack$(OBJEXT) \ diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt index 4f64f9ca72..97e983b293 100644 --- a/harbour/doc/whatsnew.txt +++ b/harbour/doc/whatsnew.txt @@ -35,6 +35,13 @@ General - Added web-server written in Harbour: uHTTPD - POCC WinCE builds are now supported. - Open Watcom 1.8 (RC3) compiler is now supported. +- Removed HB_LEGACY_LEVEL support. +- Protected incompatible changes with HB_LEGACY_LEVEL2. + (HB_SUCCESS, HB_FAILURE, HB_ERRCODE, HB_WINCE, HB_OS_WIN_32*) + These features are still available, and will be removed + in next major version (Harbour 1.2). To test your code for + compatibility, you can turn it off manually by #defining + HB_LEGACY_OFF. (HB_USER_CFLAGS=-DHB_LEGACY_OFF) Core ============================= @@ -79,6 +86,7 @@ Core HB_WILDMATCHI() like HB_WILDMATCH() but case-insentitive. HB_CDPSELECT() same as HB_SETCODEPAGE() (please upgrade to new function name). HB_CDPUNIID( ) -> + HB_GTINFO( HB_GTI_CARGO[, - Fixed UNSELECTED color updating in SetColor(). - GTWVT, GTWIN HB_GTI_CODEPAGE support. - GTWVT now supports drawing chars even if the selected codepage diff --git a/harbour/include/clipdefs.h b/harbour/include/clipdefs.h index 632799f566..82c23fd3d5 100644 --- a/harbour/include/clipdefs.h +++ b/harbour/include/clipdefs.h @@ -122,6 +122,10 @@ typedef NEARP * NEARPP; typedef HB_VMHANDLE HANDLE; #endif +#ifndef HB_LEGACY_LEVEL2 + #define ERRCODE HB_ERRCODE +#endif + typedef ERRCODE IHELP; typedef ERRCODE ICODE; diff --git a/harbour/include/filesys.api b/harbour/include/filesys.api index c2217f7f2f..8130e502e2 100644 --- a/harbour/include/filesys.api +++ b/harbour/include/filesys.api @@ -61,9 +61,7 @@ /* Compatible types */ -#ifndef HB_LEGACY_LEVEL #define FHANDLE HB_FHANDLE -#endif typedef FHANDLE fhandle; typedef FHANDLE * FHANDLEP; diff --git a/harbour/include/gt.api b/harbour/include/gt.api index 0f1160470f..8adb708d8a 100644 --- a/harbour/include/gt.api +++ b/harbour/include/gt.api @@ -58,9 +58,7 @@ #include "clipdefs.h" #include "hbapigt.h" -#ifndef HB_LEGACY_LEVEL #define CLR_STRLEN HB_CLRSTR_LEN -#endif #define _gtBox hb_gtBox #define _gtBoxD hb_gtBoxD diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index ac3b17bc80..670ece2f67 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -445,9 +445,11 @@ typedef USHORT HB_ERRCODE; #define HB_FAILURE 1 /* Compatibility #defines. Don't use them with new code and in Harbour sources. */ -#define ERRCODE HB_ERRCODE -#define SUCCESS HB_SUCCESS -#define FAILURE HB_FAILURE +#ifdef HB_LEGACY_LEVEL2 + #define ERRCODE HB_ERRCODE + #define SUCCESS HB_SUCCESS + #define FAILURE HB_FAILURE +#endif extern HB_SYMB hb_symEval; diff --git a/harbour/include/hbapierr.h b/harbour/include/hbapierr.h index d6cddc7e57..1a360f1da7 100644 --- a/harbour/include/hbapierr.h +++ b/harbour/include/hbapierr.h @@ -95,12 +95,6 @@ HB_EXTERN_BEGIN #define HB_ERR_ARGS_BASEPARAMS 0xFFFFFFFF #define HB_ERR_ARGS_SELFPARAMS 0xFFFFFFFE -#ifdef HB_LEGACY_LEVEL -/* pseudo function name in operation description - (deprecated, kept for compatibility, use HB_ERR_FUNCNAME instead) */ -extern const char hb_errFuncName; -#endif - #define HB_ERR_FUNCNAME ( ( const char * ) ( HB_PTRDIFF ) 1 ) /* Standard API */ diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h index b94cb1ee0a..6b3d27799c 100644 --- a/harbour/include/hbapifs.h +++ b/harbour/include/hbapifs.h @@ -336,11 +336,6 @@ HB_EXPORT HB_FHANDLE hb_fileHandle( PHB_FILE pFile ); /* wrapper to fopen() which calls hb_fsNameConv() */ extern FILE * hb_fopen( const char *path, const char *mode ); -#ifdef HB_LEGACY_LEVEL -/* Compatibility. Obsolete. */ -extern HB_EXPORT BYTE * hb_fileNameConv( char * str ); -#endif - HB_EXTERN_END #endif /* HB_APIFS_H_ */ diff --git a/harbour/include/hbapigt.h b/harbour/include/hbapigt.h index 9e0d92b3ff..4895a376e2 100644 --- a/harbour/include/hbapigt.h +++ b/harbour/include/hbapigt.h @@ -84,10 +84,6 @@ HB_EXTERN_BEGIN /* maximum length of color string */ #define HB_CLRSTR_LEN 64 -#ifdef HB_LEGACY_LEVEL - #define CLR_STRLEN HB_CLRSTR_LEN -#endif - /* attributes for color strings, these are the same as the ones in color.ch but prefixed with HB_ to avoid collision. */ #define HB_CLR_STANDARD 0 diff --git a/harbour/include/hbapiitm.h b/harbour/include/hbapiitm.h index 027dbc9a6c..cba878767c 100644 --- a/harbour/include/hbapiitm.h +++ b/harbour/include/hbapiitm.h @@ -65,12 +65,6 @@ typedef struct PHB_ITEM pItems[ HB_EVAL_PARAM_MAX_ + 1 ]; } HB_EVALINFO, * PHB_EVALINFO; -#ifdef HB_LEGACY_LEVEL - #define EVALINFO HB_EVALINFO - #define PEVALINFO PHB_EVALINFO - #define EVALINFO_PTR PHB_EVALINFO -#endif - extern HB_EXPORT PHB_ITEM hb_evalLaunch ( PHB_EVALINFO pEvalInfo ); extern HB_EXPORT BOOL hb_evalNew ( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem ); extern HB_EXPORT BOOL hb_evalPutParam ( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem ); diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h index b404265eae..f500b79601 100644 --- a/harbour/include/hbapirdd.h +++ b/harbour/include/hbapirdd.h @@ -69,13 +69,6 @@ HB_EXTERN_BEGIN /* #define HB_MAX_RDD_FIELDNAME_LEN 32 */ #define HB_RDD_MAX_AREA_NUM 65535 -/* Compatibility #defines. These will be removed, so - please use the new names in your code. */ -#ifdef HB_LEGACY_LEVEL - #define HARBOUR_MAX_RDD_DRIVERNAME_LENGTH HB_RDD_MAX_DRIVERNAME_LEN - #define HARBOUR_MAX_RDD_ALIAS_LENGTH HB_RDD_MAX_ALIAS_LEN -#endif - /* DBCMD errors */ diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index 239529b5e7..ffa1fa2d66 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -64,8 +64,10 @@ #include "hbver.h" /* Compatibility. Do not use HB_OS_WIN_32_USED anymore. */ -#if defined( HB_OS_WIN_32_USED ) && ! defined( HB_OS_WIN_USED ) - #define HB_OS_WIN_USED +#ifdef HB_LEGACY_LEVEL2 + #if defined( HB_OS_WIN_32_USED ) && ! defined( HB_OS_WIN_USED ) + #define HB_OS_WIN_USED + #endif #endif #if defined( __XCC__ ) || defined( __POCC__ ) || defined( __LCC__ ) || \ @@ -575,10 +577,6 @@ typedef unsigned long HB_COUNTER; # define hb_numToHandle( h ) ( ( int ) ( h ) ) #endif -#ifdef HB_LEGACY_LEVEL - #define FHANDLE HB_FHANDLE -#endif - /* maximum length of double number in decimal representation: log10(2^1024) ~ 308.25 */ #define HB_MAX_DOUBLE_LENGTH 320 diff --git a/harbour/include/hbgfxdef.ch b/harbour/include/hbgfxdef.ch index cf39bd6210..3d5acb432b 100644 --- a/harbour/include/hbgfxdef.ch +++ b/harbour/include/hbgfxdef.ch @@ -96,35 +96,4 @@ #define HB_GFX_MODE_ALPHA 3 /* Use alpha for transluced effect (SLOW) */ /* TODO: add patterned mode drawings */ -/* Compatibility #defines. - These codes are deprecated, _don't use them_. Please upgrade to the above versions. - For developers: Don't add any more new codes to this section. */ - -#ifdef HB_LEGACY_LEVEL - -#define GFX_ACQUIRESCREEN HB_GFX_ACQUIRESCREEN -#define GFX_RELEASESCREEN HB_GFX_RELEASESCREEN -#define GFX_MAKECOLOR HB_GFX_MAKECOLOR -#define GFX_CLIPTOP HB_GFX_CLIPTOP -#define GFX_CLIPLEFT HB_GFX_CLIPLEFT -#define GFX_CLIPBOTTOM HB_GFX_CLIPBOTTOM -#define GFX_CLIPRIGHT HB_GFX_CLIPRIGHT -#define GFX_SETCLIP HB_GFX_SETCLIP -#define GFX_DRAWINGMODE HB_GFX_DRAWINGMODE -#define GFX_GETPIXEL HB_GFX_GETPIXEL -#define GFX_PUTPIXEL HB_GFX_PUTPIXEL -#define GFX_LINE HB_GFX_LINE -#define GFX_RECT HB_GFX_RECT -#define GFX_FILLEDRECT HB_GFX_FILLEDRECT -#define GFX_CIRCLE HB_GFX_CIRCLE -#define GFX_FILLEDCIRCLE HB_GFX_FILLEDCIRCLE -#define GFX_ELLIPSE HB_GFX_ELLIPSE -#define GFX_FILLEDELLIPSE HB_GFX_FILLEDELLIPSE -#define GFX_FLOODFILL HB_GFX_FLOODFILL -#define GFX_MODE_SOLID HB_GFX_MODE_SOLID -#define GFX_MODE_XOR HB_GFX_MODE_XOR -#define GFX_MODE_ALPHA HB_GFX_MODE_ALPHA - -#endif - #endif /* _HBGFXDEF_CH_ */ diff --git a/harbour/include/hbgtinfo.ch b/harbour/include/hbgtinfo.ch index 886d6adaa2..19fc1a1833 100644 --- a/harbour/include/hbgtinfo.ch +++ b/harbour/include/hbgtinfo.ch @@ -175,87 +175,4 @@ #define HB_GTI_RESIZEMODE_FONT 0 /* Default */ #define HB_GTI_RESIZEMODE_ROWS 1 - -/* Compatibility #defines. - These codes are deprecated, _don't use them_. Please upgrade to the above versions. - For developers: Don't add any more new codes to this section. */ - -#ifdef HB_LEGACY_LEVEL - -#define GTI_ISGRAPHIC HB_GTI_ISGRAPHIC -#define GTI_SCREENWIDTH HB_GTI_SCREENWIDTH -#define GTI_SCREENHEIGHT HB_GTI_SCREENHEIGHT -#define GTI_SCREENDEPTH HB_GTI_SCREENDEPTH -#define GTI_FONTSIZE HB_GTI_FONTSIZE -#define GTI_FONTWIDTH HB_GTI_FONTWIDTH -#define GTI_DESKTOPWIDTH HB_GTI_DESKTOPWIDTH -#define GTI_DESKTOPHEIGHT HB_GTI_DESKTOPHEIGHT -#define GTI_DESKTOPDEPTH HB_GTI_DESKTOPDEPTH -#define GTI_COMPATBUFFER HB_GTI_COMPATBUFFER -#define GTI_KBDSHIFTS HB_GTI_KBDSHIFTS -#define GTI_KBDSPECIAL HB_GTI_KBDSPECIAL -#define GTI_KBDALT HB_GTI_KBDALT -#define GTI_FULLSCREEN HB_GTI_FULLSCREEN -#define GTI_KBDSUPPORT HB_GTI_KBDSUPPORT -#define GTI_CLIPBOARDDATA HB_GTI_CLIPBOARDDATA -#define GTI_CLIPBOARDPAST HB_GTI_CLIPBOARDPAST -#define GTI_CURSORBLINKRATE HB_GTI_CURSORBLINKRATE -#define GTI_DESKTOPROWS HB_GTI_DESKTOPROWS -#define GTI_DESKTOPCOLS HB_GTI_DESKTOPCOLS -#define GTI_FONTWEIGHT HB_GTI_FONTWEIGHT -#define GTI_FONTQUALITY HB_GTI_FONTQUALITY -#define GTI_FONTNAME HB_GTI_FONTNAME -#define GTI_CODEPAGE HB_GTI_CODEPAGE -#define GTI_WINTITLE HB_GTI_WINTITLE -#define GTI_ICONFILE HB_GTI_ICONFILE -#define GTI_ICONRES HB_GTI_ICONRES -#define GTI_MOUSESTATUS HB_GTI_MOUSESTATUS -#define GTI_INPUTFD HB_GTI_INPUTFD -#define GTI_OUTPUTFD HB_GTI_OUTPUTFD -#define GTI_ERRORFD HB_GTI_ERRORFD -#define GTI_ESCDELAY HB_GTI_ESCDELAY -#define GTI_VIEWMAXHEIGHT HB_GTI_VIEWMAXHEIGHT -#define GTI_VIEWMAXWIDTH HB_GTI_VIEWMAXWIDTH -#define GTI_VIEWPORTHEIGHT HB_GTI_VIEWPORTHEIGHT -#define GTI_VIEWPORTWIDTH HB_GTI_VIEWPORTWIDTH -#define GTI_STDOUTCON HB_GTI_STDOUTCON -#define GTI_STDERRCON HB_GTI_STDERRCON -#define GTI_ISCTWIN HB_GTI_ISCTWIN -#define GTI_ISMULTIWIN HB_GTI_ISMULTIWIN -#define GTI_GETWIN HB_GTI_GETWIN -#define GTI_SETWIN HB_GTI_SETWIN -#define GTI_NEWWIN HB_GTI_NEWWIN -#define GTI_ADDKEYMAP HB_GTI_ADDKEYMAP -#define GTI_DELKEYMAP HB_GTI_DELKEYMAP -#define GTI_ISUNICODE HB_GTI_ISUNICODE - -/* Font weights */ -#define GTI_FONTW_THIN HB_GTI_FONTW_THIN -#define GTI_FONTW_NORMAL HB_GTI_FONTW_NORMAL -#define GTI_FONTW_BOLD HB_GTI_FONTW_BOLD - -/* Font sizes */ -#define GTI_FONTQ_DRAFT HB_GTI_FONTQ_DRAFT -#define GTI_FONTQ_NORMAL HB_GTI_FONTQ_NORMAL -#define GTI_FONTQ_HIGH HB_GTI_FONTQ_HIGH - -/* Keyboard shifts states */ -#define GTI_KBD_SHIFT HB_GTI_KBD_SHIFT -#define GTI_KBD_CTRL HB_GTI_KBD_CTRL -#define GTI_KBD_ALT HB_GTI_KBD_ALT -#define GTI_KBD_LWIN HB_GTI_KBD_LWIN -#define GTI_KBD_RWIN HB_GTI_KBD_RWIN -#define GTI_KBD_MENU HB_GTI_KBD_MENU -#define GTI_KBD_INSERT HB_GTI_KBD_INSERT -#define GTI_KBD_SCROLOCK HB_GTI_KBD_SCROLOCK -#define GTI_KBD_NUMLOCK HB_GTI_KBD_NUMLOCK -#define GTI_KBD_CAPSLOCK HB_GTI_KBD_CAPSLOCK -#define GTI_KBD_INALTSEQ HB_GTI_KBD_INALTSEQ -#define GTI_KBD_ACCENT1 HB_GTI_KBD_ACCENT1 -#define GTI_KBD_ACCENT2 HB_GTI_KBD_ACCENT2 -#define GTI_KBD_ACCENT3 HB_GTI_KBD_ACCENT3 -#define GTI_KBD_ACCENT4 HB_GTI_KBD_ACCENT4 - -#endif - #endif /* HB_GTINFO_CH_ */ diff --git a/harbour/include/hbsetup.ch b/harbour/include/hbsetup.ch index 9fbfe32b35..78908cf72d 100644 --- a/harbour/include/hbsetup.ch +++ b/harbour/include/hbsetup.ch @@ -50,7 +50,7 @@ * */ -/* NOTE: This file is used by C code and at Harbour build time. +/* 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_ @@ -71,16 +71,16 @@ /* #define HB_COMPAT_CLIP */ /* Enable CLIP extensions */ /* *********************************************************************** - * Leave this #define if you want to allow usage of legacy Harbour 1.0.0/Clipper - * #defines/types/functions in your 3rd party C code. In later Harbour - * versions this macro will be first disabled by default, then completely - * removed, leaving the only default the strict Harbour namespace without - * legacy stuff. + * Leave this #define if you want to allow usage of legacy Harbour 1.0.0/Clipper + * #defines/types/functions in your 3rd party C code. In later Harbour + * versions this macro will be first disabled by default, then completely + * removed, leaving the only default the strict Harbour namespace without + * legacy stuff. * You should modify your 3rd party code to compile without this macro ASAP. * NOTE: C code using legacy Clipper (.api) headers is unaffected. */ #ifndef HB_LEGACY_OFF -/* #define HB_LEGACY_LEVEL 1 */ +#define HB_LEGACY_LEVEL2 1 #endif #endif /* HB_SETUP_CH_ */ diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index 7fb308360c..825928866d 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -290,7 +290,9 @@ #if defined(WINNT) || defined(_Windows) || defined(__NT__) || defined(_WIN32) || defined(_WINDOWS_) || defined(__WINDOWS_386__) || defined(__WIN32__) || defined(__CYGWIN__) #define HB_OS_WIN /* Compatibility. Do not use this. */ - #define HB_OS_WIN_32 + #ifdef HB_LEGACY_LEVEL2 + #define HB_OS_WIN_32 + #endif #endif #endif @@ -305,6 +307,10 @@ #ifndef HB_OS_WIN_CE #if defined(_WINCE) || defined(__CEGCC__) || defined(__MINGW32CE__) || (defined(__POCC_TARGET__) && __POCC_TARGET__ == 2) #define HB_OS_WIN_CE + /* Compatibility. Do not use this. */ + #ifdef HB_LEGACY_LEVEL2 + #define HB_WINCE + #endif #endif #endif @@ -362,15 +368,6 @@ #define HB_OS_EOL_LEN 2 #endif -/* Compatibility #defines. These will be removed, so - please use the new names in your code. */ -#ifdef HB_LEGACY_LEVEL - #define OS_PATH_DELIMITER HB_OS_PATH_DELIM_CHR - #ifdef HB_OS_UNIX_COMPATIBLE - #define OS_UNIX_COMPATIBLE - #endif -#endif - #if defined(HB_OS_WIN_CE) && defined(HB_MT_VM) #undef HB_MT_VM #endif diff --git a/harbour/include/item.api b/harbour/include/item.api index 1c070dcfe4..f813084209 100644 --- a/harbour/include/item.api +++ b/harbour/include/item.api @@ -57,10 +57,8 @@ #include "hbapiitm.h" -#ifndef HB_LEGACY_LEVEL #define EVALINFO HB_EVALINFO #define PEVALINFO PHB_EVALINFO -#endif typedef PEVALINFO EVALINFOP; diff --git a/harbour/include/rdd.api b/harbour/include/rdd.api index a1b0c97324..b2ce268e06 100644 --- a/harbour/include/rdd.api +++ b/harbour/include/rdd.api @@ -59,6 +59,11 @@ #include "hbapirdd.h" #include "item.api" +#ifndef HB_LEGACY_LEVEL2 + #define SUCCESS HB_SUCCESS + #define FAILURE HB_FAILURE +#endif + #define _rddInherit hb_rddInherit #if 0 #define _rddDisinherit( x ) hb_rddDisinherit( ( const char * ) x ) diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errorapi.c index 2bbdb7e463..6d82e545bb 100644 --- a/harbour/source/rtl/errorapi.c +++ b/harbour/source/rtl/errorapi.c @@ -111,11 +111,6 @@ HB_FUNC_EXTERN( ERRORNEW ); -#ifdef HB_LEGACY_LEVEL -/* pseudo function name in operation description - (deprecated, kept for compatibility, use HB_ERR_FUNCNAME instead) */ -const char hb_errFuncName = 1; -#endif static PHB_ITEM s_pError = NULL; diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index c8d2bc3660..820d9aa71b 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -3213,25 +3213,6 @@ BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) return szFileName; } -#ifdef HB_LEGACY_LEVEL - -BYTE * hb_fileNameConv( char * szFileName ) -{ - BOOL fFree; - BYTE * szNew; - - szNew = hb_fsNameConv( ( BYTE * ) szFileName, &fFree ); - if( fFree ) - { - hb_strncpy( szFileName, ( char * ) szNew, strlen( szFileName ) ); - hb_xfree( szNew ); - } - - return ( BYTE * ) szFileName; -} - -#endif - /* NOTE: pbyBuffer must be _POSIX_PATH_MAX + 1 long. */ void hb_fsBaseDirBuff( BYTE * pbyBuffer ) { diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile index 78da51a667..2cc28d67ea 100644 --- a/harbour/source/vm/Makefile +++ b/harbour/source/vm/Makefile @@ -33,7 +33,6 @@ C_SOURCES=\ classes.c \ cmdarg.c \ debug.c \ - debugold.c \ dynlibhb.c \ dynsym.c \ codebloc.c \ diff --git a/harbour/source/vm/cmdarg.c b/harbour/source/vm/cmdarg.c index 320b02efc5..52d5479923 100644 --- a/harbour/source/vm/cmdarg.c +++ b/harbour/source/vm/cmdarg.c @@ -65,31 +65,14 @@ static int s_argc = 0; static char ** s_argv = NULL; #if defined( HB_OS_WIN ) + static char s_szAppName[ MAX_PATH ]; static TCHAR s_lpAppName[ MAX_PATH ]; -#endif -#if defined( HB_OS_WIN ) && defined( HB_OS_WIN_USED ) - -HB_EXTERN_BEGIN - -#ifdef HB_LEGACY_LEVEL - /* NOTE: 1.0 compatibility stuff. Will be removed in 1.1 [vszakats]. */ - #define s_hInstance hb_hInstance - #define s_hPrevInstance hb_hPrevInstance - - HANDLE s_hInstance = 0; - HANDLE s_hPrevInstance = 0; - int s_iCmdShow = 0; - BOOL s_WinMainParam = FALSE; -#else - static HANDLE s_hInstance = 0; - static HANDLE s_hPrevInstance = 0; - static int s_iCmdShow = 0; - static BOOL s_WinMainParam = FALSE; -#endif - -HB_EXTERN_END +static HANDLE s_hInstance = 0; +static HANDLE s_hPrevInstance = 0; +static int s_iCmdShow = 0; +static BOOL s_WinMainParam = FALSE; void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow ) { diff --git a/harbour/source/vm/debugold.c b/harbour/source/vm/debugold.c deleted file mode 100644 index 3638d3c175..0000000000 --- a/harbour/source/vm/debugold.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * Debugging compatibility functions - * - * Copyright 1999 Eddie Runia - * www - http://www.harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -#include "hbapi.h" - -#ifdef HB_LEGACY_LEVEL - -HB_FUNC_EXTERN( __DBGVMSTKLCOUNT ); - -HB_FUNC( HB_DBG_VMSTKLCOUNT ) -{ - HB_FUNC_EXEC( __DBGVMSTKLCOUNT ); -} - -HB_FUNC_EXTERN( __DBGVMPARLLIST ); - -HB_FUNC( HB_DBG_VMPARLLIST ) -{ - HB_FUNC_EXEC( __DBGVMPARLLIST ); -} - -HB_FUNC_EXTERN( __DBGVMVARLGET ); - -HB_FUNC( HB_DBG_VMVARLGET ) -{ - HB_FUNC_EXEC( __DBGVMVARLGET ); -} - -HB_FUNC_EXTERN( __DBGVMVARSLEN ); - -HB_FUNC( HB_DBG_VMVARSLEN ) -{ - HB_FUNC_EXEC( __DBGVMVARSLEN ); -} - -#if 0 - -HB_FUNC_EXTERN( __DBGVMSTKLLIST ); - -HB_FUNC( HB_DBG_VMSTKLLIST ) -{ - HB_FUNC_EXEC( __DBGVMSTKLLIST ); -} - -HB_FUNC_EXTERN( __DBGVMVARLSET ); - -HB_FUNC( HB_DBG_VMVARLSET ) -{ - HB_FUNC_EXEC( __DBGVMVARLSET ); -} - -HB_FUNC_EXTERN( __DBGVMSTKGLIST ); - -HB_FUNC( HB_DBG_VMSTKGLIST ) -{ - HB_FUNC_EXEC( __DBGVMSTKGLIST ); -} - -HB_FUNC_EXTERN( __DBGVMSTKGCOUNT ); - -HB_FUNC( HB_DBG_VMSTKGCOUNT ) -{ - HB_FUNC_EXEC( __DBGVMSTKGCOUNT ); -} - -HB_FUNC_EXTERN( __DBGVMVARGLIST ); - -HB_FUNC( HB_DBG_VMVARGLIST ) -{ - HB_FUNC_EXEC( __DBGVMVARGLIST ); -} - -HB_FUNC_EXTERN( __DBGVMVARSLIST ); - -HB_FUNC( HB_DBG_VMVARSLIST ) -{ - HB_FUNC_EXEC( __DBGVMVARSLIST ); -} - -HB_FUNC_EXTERN( __DBGVMVARSGET ); - -HB_FUNC( HB_DBG_VMVARSGET ) -{ - HB_FUNC_EXEC( __DBGVMVARSGET ); -} - -HB_FUNC_EXTERN( __DBGVMVARSSET ); - -HB_FUNC( HB_DBG_VMVARSSET ) -{ - HB_FUNC_EXEC( __DBGVMVARSSET ); -} - -#endif - -#endif diff --git a/harbour/source/vm/vmmt/Makefile b/harbour/source/vm/vmmt/Makefile index f63fff018c..25d5122e88 100644 --- a/harbour/source/vm/vmmt/Makefile +++ b/harbour/source/vm/vmmt/Makefile @@ -34,7 +34,6 @@ C_SOURCES=\ classes.c \ cmdarg.c \ debug.c \ - debugold.c \ dynlibhb.c \ dynsym.c \ codebloc.c \