From 97ace9756df1942dbeff0a4735a58c3a1f2137ee Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 25 Jun 1999 01:42:48 +0000 Subject: [PATCH] *** empty log message *** --- harbour/ChangeLog | 47 ++++++++++ harbour/gt.b32 | 34 ++++---- harbour/include/Makefile | 2 +- harbour/include/box.ch | 33 ++++--- harbour/include/box.h | 7 +- harbour/include/compiler.h | 6 +- harbour/include/ctoharb.h | 6 +- harbour/include/dates.h | 10 ++- harbour/include/error.api | 21 ++--- harbour/include/error.ch | 20 ++--- harbour/include/errorapi.h | 15 ++-- harbour/include/extend.api | 10 ++- harbour/include/extend.h | 11 ++- harbour/include/fileio.ch | 2 +- harbour/include/filesys.api | 6 +- harbour/include/filesys.h | 6 +- harbour/include/fm.api | 10 ++- harbour/include/gt.api | 6 +- harbour/include/gtapi.h | 6 +- harbour/include/{types.h => hbdefs.h} | 8 +- harbour/include/hberrors.h | 6 +- harbour/include/hbpp.h | 10 +-- harbour/include/hbsetup.h | 6 +- harbour/include/init.h | 6 +- harbour/include/inkey.ch | 4 + harbour/include/item.api | 12 ++- harbour/include/itemapi.h | 6 +- harbour/include/pcode.h | 6 +- harbour/include/rdd.api | 13 +-- harbour/include/set.ch | 3 + harbour/include/set.h | 12 +-- harbour/include/test.ch | 3 - harbour/include/version.h | 6 +- harbour/makefile.b16 | 62 +++++++------- harbour/makefile.b31 | 102 +++++++++++----------- harbour/makefile.b32 | 66 +++++++------- harbour/makefile.icc | 118 +++++++++++++------------- harbour/source/compiler/Makefile | 4 +- harbour/source/compiler/genobj32.c | 2 +- harbour/source/compiler/harbour.l | 2 +- harbour/source/compiler/harbour.y | 2 +- harbour/source/hbpp/harb.h | 2 +- harbour/source/rtl/copyfile.c | 2 +- harbour/source/rtl/dates.c | 1 + harbour/source/rtl/errorapi.c | 4 +- harbour/source/rtl/extend.c | 1 + harbour/source/rtl/hardcr.c | 14 +-- harbour/source/rtl/itemapi.c | 8 +- harbour/source/rtl/mtran.c | 23 ++--- harbour/source/rtl/set.c | 4 +- harbour/source/rtl/transfrm.c | 1 + harbour/source/vm/initsymb.c | 2 +- harbour/terminal.b32 | 8 +- harbour/tests/working/hscript/cgi.ch | 32 +++++++ 54 files changed, 446 insertions(+), 373 deletions(-) rename harbour/include/{types.h => hbdefs.h} (96%) delete mode 100644 harbour/include/test.ch create mode 100644 harbour/tests/working/hscript/cgi.ch diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ebecb52bfd..6170ae12e0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,50 @@ +19990625-01:05 CET Victor Szel + * include/extend.h + include/dates.h + source/rtl/extend.c + source/rtl/itemapi.c + source/rtl/transfrm.c + source/rtl/dates.c + makefile.b31 + makefile.icc + hb_date*() function definitions moved to + dates.h, all required changed made in sources. + ! source/rtl/copyfile.c + buffer size 8096 -> 8192 + * source/rtl/types.h + SYMBOL_UNUSED() -> HB_SYMBOL_UNUSED() + + source/rtl/errorapi.c, include/errorapi.h + Added return value to hb_errorRT_BASE() + ! test.ch removed again from /include + ! cgi.ch added again to tests/working/hscript + * source/rtl/mtran.c + source/rtl/hardcr.c (fixed) + changes by Jose Lalin. + * include/*.h, include/*.api + Clean-ups, headers added, HB_ prefixes, + minor fixes. + * include/set.h + source/rtl/set.c + InitializeSets() -> hb_setInitialize() + ReleaseSets() -> hb_setRelease() + * types.h -> hb_types.h + include\extend.h + include\hbtypes.h + include\makefile + include\set.h + source\compiler\genobj32.c + source\compiler\harbour.l + source\compiler\harbour.y + source\compiler\makefile + source\hbpp\harb.h + source\vm\initsymb.c + gt.b32 + makefile.b16 + makefile.b31 + makefile.b32 + makefile.icc + terminal.b32 + 19990624-19:30 EDT David G. Holm * makefile.icc - environ.c needs to be dependent upon version.h diff --git a/harbour/gt.b32 b/harbour/gt.b32 index 925b8f82f9..7a7c1b4479 100644 --- a/harbour/gt.b32 +++ b/harbour/gt.b32 @@ -12,23 +12,23 @@ libs\b32\hbgt.lib : \ strasint.obj strcount.obj strcspn.obj strdiff.obj strexpan.obj \ strleft.obj strpbrk.obj strright.obj -ascpos.obj : ascpos.c extend.h types.h -atdiff.obj : atdiff.c extend.h types.h -chareven.obj : chareven.c extend.h types.h -charodd.obj : charodd.c extend.h types.h -chrcount.obj : chrcount.c extend.h types.h -chrtotal.obj : chrtotal.c extend.h types.h -charmix.obj : charmix.c extend.h types.h -asciisum.obj : asciisum.c extend.h types.h -chrfirst.obj : chrfirst.c extend.h types.h -strasint.obj : strasint.c extend.h types.h -strcount.obj : strcount.c extend.h types.h -strcspn.obj : strcspn.c extend.h types.h -strdiff.obj : strdiff.c extend.h types.h -strexpan.obj : strexpan.c extend.h types.h -strleft.obj : strleft.c extend.h types.h -strpbrk.obj : strpbrk.c extend.h types.h -strright.obj : strright.c extend.h types.h +ascpos.obj : ascpos.c extend.h hbdefs.h +atdiff.obj : atdiff.c extend.h hbdefs.h +chareven.obj : chareven.c extend.h hbdefs.h +charodd.obj : charodd.c extend.h hbdefs.h +chrcount.obj : chrcount.c extend.h hbdefs.h +chrtotal.obj : chrtotal.c extend.h hbdefs.h +charmix.obj : charmix.c extend.h hbdefs.h +asciisum.obj : asciisum.c extend.h hbdefs.h +chrfirst.obj : chrfirst.c extend.h hbdefs.h +strasint.obj : strasint.c extend.h hbdefs.h +strcount.obj : strcount.c extend.h hbdefs.h +strcspn.obj : strcspn.c extend.h hbdefs.h +strdiff.obj : strdiff.c extend.h hbdefs.h +strexpan.obj : strexpan.c extend.h hbdefs.h +strleft.obj : strleft.c extend.h hbdefs.h +strpbrk.obj : strpbrk.c extend.h hbdefs.h +strright.obj : strright.c extend.h hbdefs.h .prg.c: bin\b32\harbour $< /n diff --git a/harbour/include/Makefile b/harbour/include/Makefile index 6a5fe142ae..ca7432301f 100644 --- a/harbour/include/Makefile +++ b/harbour/include/Makefile @@ -15,6 +15,7 @@ C_HEADERS=\ extra.h \ filesys.h \ gtapi.h \ + hbdefs.h \ hberrors.h \ hbpp.h \ hbsetup.h \ @@ -23,7 +24,6 @@ C_HEADERS=\ pcode.h \ set.h \ super.h \ - types.h \ version.h \ PRG_HEADERS=\ diff --git a/harbour/include/box.ch b/harbour/include/box.ch index 5613c8cfd5..e371332a11 100644 --- a/harbour/include/box.ch +++ b/harbour/include/box.ch @@ -1,27 +1,26 @@ /* - * $ + * $Id$ */ -// Harbour BOX.CH -// #defines for DISPBOX() - #ifndef _BOX_CH #define _BOX_CH - // Single-line - #define B_SINGLE ( CHR(218) + CHR(196) + CHR(191) + CHR(179) + ; - CHR(217) + CHR(196) + CHR(192) + CHR(179) ) +// #defines for DISPBOX() - // Double-line - #define B_DOUBLE ( CHR(201) + CHR(205) + CHR(187) + CHR(186) + ; - CHR(188) + CHR(205) + CHR(200) + CHR(186) ) +// Single-line +#define B_SINGLE ( CHR(218) + CHR(196) + CHR(191) + CHR(179) + ; + CHR(217) + CHR(196) + CHR(192) + CHR(179) ) - // Single-line top, double-line sides - #define B_SINGLE_DOUBLE ( CHR(214) + CHR(196) + CHR(183) + CHR(186) + ; - CHR(189) + CHR(196) + CHR(211) + CHR(186) ) +// Double-line +#define B_DOUBLE ( CHR(201) + CHR(205) + CHR(187) + CHR(186) + ; + CHR(188) + CHR(205) + CHR(200) + CHR(186) ) - // Double-line top, single-line sides - #define B_DOUBLE_SINGLE ( CHR(213) + CHR(205) + CHR(184) + CHR(179) + ; - CHR(190) + CHR(205) + CHR(212) + CHR(179) ) +// Single-line top, double-line sides +#define B_SINGLE_DOUBLE ( CHR(214) + CHR(196) + CHR(183) + CHR(186) + ; + CHR(189) + CHR(196) + CHR(211) + CHR(186) ) -#endif +// Double-line top, single-line sides +#define B_DOUBLE_SINGLE ( CHR(213) + CHR(205) + CHR(184) + CHR(179) + ; + CHR(190) + CHR(205) + CHR(212) + CHR(179) ) + +#endif /* _BOX_CH */ diff --git a/harbour/include/box.h b/harbour/include/box.h index 3758a3553c..9b2d93d855 100644 --- a/harbour/include/box.h +++ b/harbour/include/box.h @@ -1,7 +1,10 @@ /* - * $ + * $Id$ */ +#ifndef HB_BOX_H_ +#define HB_BOX_H_ + /* strings for borders (same as box.ch, but defined for use by C) */ /*01234567*/ #define B_NONE " " @@ -9,3 +12,5 @@ #define B_DOUBLE "ÉÍ»º¼ÍȺ" #define B_SINGLE_DOUBLE "ÖÄ·º½ÄÓº" #define B_DOUBLE_SINGLE "Õ͸³¾ÍÔ³" + +#endif /* HB_BOX_H_ */ diff --git a/harbour/include/compiler.h b/harbour/include/compiler.h index da2d45265e..4a79dfd9dc 100644 --- a/harbour/include/compiler.h +++ b/harbour/include/compiler.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef COMPILER_H_ -#define COMPILER_H_ +#ifndef HB_COMPILER_H_ +#define HB_COMPILER_H_ /* compiler related declarations */ @@ -69,4 +69,4 @@ void * OurMalloc( LONG lSize ); /* our malloc with error control */ void * OurRealloc( void * p, LONG lSize ); /* our malloc with error control */ void OurFree( void * p ); /* releases allocated memory */ -#endif /* COMPILER_H_ */ +#endif /* HB_COMPILER_H_ */ diff --git a/harbour/include/ctoharb.h b/harbour/include/ctoharb.h index 98e49f8388..0acd0556e9 100644 --- a/harbour/include/ctoharb.h +++ b/harbour/include/ctoharb.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef CTOHARB_H_ -#define CTOHARB_H_ +#ifndef HB_CTOHARB_H_ +#define HB_CTOHARB_H_ /* Calling Harbour from C code */ @@ -23,4 +23,4 @@ void Do( WORD wParams ); /* invokes the virtual machine */ void Function( WORD wParams ); /* invokes the virtual machine */ void StackShow( void ); -#endif /* CTOHARB_H_ */ +#endif /* HB_CTOHARB_H_ */ diff --git a/harbour/include/dates.h b/harbour/include/dates.h index 816b9bd3d7..e12d43ab74 100644 --- a/harbour/include/dates.h +++ b/harbour/include/dates.h @@ -2,9 +2,11 @@ * $Id$ */ -#ifndef DATES_H_ -#define DATES_H_ +#ifndef HB_DATES_H_ +#define HB_DATES_H_ -char * hb_dtoc (char * szDate, char * szDateFormat); +char * hb_dtoc (char * szDate, char * szDateFormat); +long hb_dateEncode( long lDay, long lMonth, long lYear ); +void hb_dateDecode( long julian, long * plDay, long * plMonth, long * plYear ); -#endif /* DATES_H_ */ +#endif /* HB_DATES_H_ */ diff --git a/harbour/include/error.api b/harbour/include/error.api index 4af7931de6..49a4e8add3 100644 --- a/harbour/include/error.api +++ b/harbour/include/error.api @@ -1,19 +1,11 @@ -// -// $Id$ -// +/* + * $Id$ + */ -// error.api -// -#ifndef _ERROR_API -#define _ERROR_API -//+ -// Harbour project -// -// 99.04.25 initial posting. -// compatible -//- +#ifndef HB_ERROR_API_ +#define HB_ERROR_API_ -#include "errorapi.h" +#include #define _errNew hb_errNew #define _errLaunch hb_errLaunch @@ -40,3 +32,4 @@ #define _errGetFileName hb_errGetFileName #define _errPutFileNaem hb_errPutFileName +#endif /* HB_ERROR_API_ */ diff --git a/harbour/include/error.ch b/harbour/include/error.ch index 669a34fa71..fe03447277 100644 --- a/harbour/include/error.ch +++ b/harbour/include/error.ch @@ -1,15 +1,9 @@ -// error.ch - -//+ -// Harbour project -// -// -// 99.04.25 initial posting. -// no prototypes yet -// -// -//- +/* + * $Id$ + */ +#ifndef _ERROR_CH +#define _ERROR_CH // Severity levels (oError:severity) #define ES_WHOCARES 0 @@ -58,6 +52,4 @@ #define EG_APPENDLOCK 40 #define EG_LOCK 41 -#define _ERROR_CH - - +#endif /* _ERROR_CH */ diff --git a/harbour/include/errorapi.h b/harbour/include/errorapi.h index 2e2cbb99b3..4e3b6983dc 100644 --- a/harbour/include/errorapi.h +++ b/harbour/include/errorapi.h @@ -1,5 +1,8 @@ -/* $Id$ +/* + * $Id$ + */ +/* Harbour Project source code This file contains the Harbour internal error handling definitions @@ -24,11 +27,11 @@ V 1.0 1999-04-25 - Initial posting. */ -#ifndef ERRORAPI_H_ -#define ERRORAPI_H_ +#ifndef HB_ERRORAPI_H_ +#define HB_ERRORAPI_H_ #include -#include "error.ch" +#include /* Error codes (returned from hb_errLaunch()) */ @@ -93,10 +96,10 @@ PHB_ITEM hb_errPutFileName( PHB_ITEM pError, char * szFileName ); /* Error launchers */ -void hb_errorRT_BASE( ULONG ulGenCode, ULONG ulSubCode, char* szDescription, char* szOperation ); +WORD hb_errorRT_BASE( ULONG ulGenCode, ULONG ulSubCode, char* szDescription, char* szOperation ); /* TODO: Enable this: void hb_errorInternal( ULONG ulCode ); */ -#endif /* ERRORAPI_H_ */ +#endif /* HB_ERRORAPI_H_ */ diff --git a/harbour/include/extend.api b/harbour/include/extend.api index 399ea013c2..426695ef31 100644 --- a/harbour/include/extend.api +++ b/harbour/include/extend.api @@ -1,5 +1,9 @@ -#ifndef __EXTEND_API -#define __EXTEND_API +/* + * $Id$ + */ + +#ifndef HB_EXTEND_API_ +#define HB_EXTEND_API_ #include @@ -30,4 +34,4 @@ #define _storni hb_storni #define _stornl hb_stornl -#endif +#endif /* HB_EXTEND_API_ */ diff --git a/harbour/include/extend.h b/harbour/include/extend.h index e1900ebea2..bd56a1fb53 100644 --- a/harbour/include/extend.h +++ b/harbour/include/extend.h @@ -2,14 +2,14 @@ * $Id$ */ -#ifndef EXTEND_H_ -#define EXTEND_H_ +#ifndef HB_EXTEND_H_ +#define HB_EXTEND_H_ #include #include #include #include -#include +#include #include typedef struct /* symbol support structure */ @@ -144,6 +144,7 @@ void hb_stornl( long lValue, WORD wParam, ... ); /* stores a long on a varia void * hb_xgrab( ULONG lSize ); /* allocates memory */ void * hb_xrealloc( void * pMem, ULONG lSize ); /* reallocates memory */ void hb_xfree( void * pMem ); /* frees memory */ + void ItemCopy( PHB_ITEM pDest, PHB_ITEM pSource ); void ItemRelease( PHB_ITEM pItem ); @@ -164,8 +165,6 @@ int hb_itemStrCmp( PHB_ITEM pFirst, PHB_ITEM pSecond, BOOL bForceExact ); / char * hb_str( PHB_ITEM pNumber, PHB_ITEM pWidth, PHB_ITEM pDec ); /* convert number to string */ int hb_stricmp( const char *s1, const char *s2 ); BOOL hb_strempty( char * szText, ULONG ulLen ); -long hb_dateEncode( long lDay, long lMonth, long lYear ); -void hb_dateDecode( long julian, long * plDay, long * plMonth, long * plYear ); HARBOURFUNC GetMethod( PHB_ITEM pObject, PSYMBOL pSymMsg ); /* returns the method pointer of a object class */ char * hb_GetClassName( PHB_ITEM pObject ); /* retrieves an object class name */ @@ -175,4 +174,4 @@ PDYNSYM GetDynSym( char * szName ); /* finds and creates a dynamic symbol if PDYNSYM NewDynSym( PSYMBOL pSymbol ); /* creates a new dynamic symbol based on a local one */ PDYNSYM FindDynSym( char * szName ); /* finds a dynamic symbol */ -#endif /* EXTEND_H_ */ +#endif /* HB_EXTEND_H_ */ diff --git a/harbour/include/fileio.ch b/harbour/include/fileio.ch index 6f893c73c9..311526f828 100644 --- a/harbour/include/fileio.ch +++ b/harbour/include/fileio.ch @@ -47,4 +47,4 @@ #define FXO_DEFAULTS 0x1000 /* Use SET command defaults */ #define FXO_DEVICERAW 0x2000 /* Open devices in raw mode */ -#endif +#endif /* _FILEIO_CH */ diff --git a/harbour/include/filesys.api b/harbour/include/filesys.api index aa96fef2ad..5afbe9d029 100644 --- a/harbour/include/filesys.api +++ b/harbour/include/filesys.api @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef _FILESYS_API -#define _FILESYS_API +#ifndef HB_FILESYS_API_ +#define HB_FILESYS_API_ #include @@ -27,4 +27,4 @@ #define _fsSeek hb_fsSeek #define _fsWrite hb_fsWrite -#endif +#endif /* HB_FILESYS_API_ */ diff --git a/harbour/include/filesys.h b/harbour/include/filesys.h index 6681512284..6504b7584f 100644 --- a/harbour/include/filesys.h +++ b/harbour/include/filesys.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef FILESYS_H_ -#define FILESYS_H_ +#ifndef HB_FILESYS_H_ +#define HB_FILESYS_H_ #include #include @@ -34,4 +34,4 @@ void hb_fsRename ( BYTEP fpOldName, BYTEP fpNewName ); ULONG hb_fsSeek ( FHANDLE hFileHandle, LONG lOffset, USHORT uiMode ); USHORT hb_fsWrite ( FHANDLE hFileHandle, BYTEP fpBuff, USHORT uiCount ); -#endif /* FILESYS_H_ */ +#endif /* HB_FILESYS_H_ */ diff --git a/harbour/include/fm.api b/harbour/include/fm.api index 85f4e5d446..fcae2885c0 100644 --- a/harbour/include/fm.api +++ b/harbour/include/fm.api @@ -1,5 +1,9 @@ -#ifndef __FM_API -#define __FM_API +/* + * $Id$ + */ + +#ifndef HB_FM_API_ +#define HB_FM_API_ #include @@ -7,4 +11,4 @@ #define _xrealloc hb_xrealloc #define _xfree hb_xfree -#endif +#endif /* HB_FM_API_ */ diff --git a/harbour/include/gt.api b/harbour/include/gt.api index 1daba5d25a..b6be799d42 100644 --- a/harbour/include/gt.api +++ b/harbour/include/gt.api @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef _GT_API -#define _GT_API +#ifndef HB_GT_API_ +#define HB_GT_API_ #include @@ -39,4 +39,4 @@ #define _gtWriteAt hb_gtWriteAt #define _gtWriteCon hb_gtWriteCon -#endif /* _GT_API */ +#endif /* HB_GT_API_ */ diff --git a/harbour/include/gtapi.h b/harbour/include/gtapi.h index 058b45c4cc..7c3be1e8ab 100644 --- a/harbour/include/gtapi.h +++ b/harbour/include/gtapi.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef GTAPI_H_ -#define GTAPI_H_ +#ifndef HB_GTAPI_H_ +#define HB_GTAPI_H_ #include #include @@ -119,4 +119,4 @@ void gtPuts(char x, char y, char attr, char *str, int len); void gtGetText(char x1, char y1, char x2, char y2, char *dest); void gtPutText(char x1, char y1, char x2, char y2, char *srce); -#endif /* GTAPI_H_ */ +#endif /* HB_GTAPI_H_ */ diff --git a/harbour/include/types.h b/harbour/include/hbdefs.h similarity index 96% rename from harbour/include/types.h rename to harbour/include/hbdefs.h index 1bbcd5b7eb..a9851a4277 100644 --- a/harbour/include/types.h +++ b/harbour/include/hbdefs.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef TYPES_H_ -#define TYPES_H_ +#ifndef HB_DEFS_H_ +#define HB_DEFS_H_ #include @@ -71,7 +71,7 @@ typedef HARBOUR ( * HARBOURFUNC )( void ); #define _POSIX_PATH_MAX 255 #endif -#define SYMBOL_UNUSED(symbol) (void)symbol +#define HB_SYMBOL_UNUSED(symbol) (void)symbol #define IS_BYREF( p ) ( ( p )->wType & IT_BYREF ) #define IS_OF_TYPE( p, t ) ( ( ( p )->wType & ~IT_BYREF ) == t ) @@ -99,4 +99,4 @@ typedef HARBOUR ( * HARBOURFUNC )( void ); #define ISARRAY( n ) hb_param( n, IT_ARRAY ) #define ALENGTH( n ) hb_parinfa( n, 0 ) /* TODO! */ -#endif /* TYPES_H_ */ +#endif /* HB_DEFS_H_ */ diff --git a/harbour/include/hberrors.h b/harbour/include/hberrors.h index d53b22a9b3..9c9c1ca083 100644 --- a/harbour/include/hberrors.h +++ b/harbour/include/hberrors.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef HBERRORS_H_ -#define HBERRORS_H_ +#ifndef HB_ERROR_H_ +#define HB_ERROR_H_ /* * Errors generated by Harbour compiler @@ -45,4 +45,4 @@ void GenError( int, char*, char * ); /* generic parsing error management function */ void GenWarning( int, char*, char * ); /* generic parsing warning management function */ -#endif /* HBERRORS_H_ */ +#endif /* HB_ERROR_H_ */ diff --git a/harbour/include/hbpp.h b/harbour/include/hbpp.h index c6e85df56d..8112b75190 100644 --- a/harbour/include/hbpp.h +++ b/harbour/include/hbpp.h @@ -1,11 +1,11 @@ /* * $Id$ - * - * Definitions shared by harbour.y and preprocessor */ -#ifndef HBPP_H_ -#define HBPP_H_ +/* Definitions shared by harbour.y and preprocessor */ + +#ifndef HB_PP_H_ +#define HB_PP_H_ /* ------------------------------------------ */ typedef struct @@ -24,4 +24,4 @@ typedef struct char *value; } COMMANDS, TRANSLATES; -#endif /* HBPP_H_ */ +#endif /* HB_PP_H_ */ diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h index 7811b79936..9e92550aea 100644 --- a/harbour/include/hbsetup.h +++ b/harbour/include/hbsetup.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef HBSETUP_H_ -#define HBSETUP_H_ +#ifndef HB_SETUP_H_ +#define HB_SETUP_H_ /* * Harbour compiler and runtime configuration file @@ -65,4 +65,4 @@ #define OS_DOS_COMPATIBLE #endif -#endif /* HBSETUP_H_ */ +#endif /* HB_SETUP_H_ */ diff --git a/harbour/include/init.h b/harbour/include/init.h index 5d1db25d8f..7160bcfe65 100644 --- a/harbour/include/init.h +++ b/harbour/include/init.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef INIT_H_ -#define INIT_H_ +#ifndef HB_INIT_H_ +#define HB_INIT_H_ /* Harbour local symbols initialization */ @@ -44,4 +44,4 @@ static int InitSymbols( void ) static int _STATIC_INT_INIT_SYMBOLS = InitSymbols(); #endif -#endif /* INIT_H_ */ +#endif /* HB_INIT_H_ */ diff --git a/harbour/include/inkey.ch b/harbour/include/inkey.ch index 24225a43dc..08a19b73a4 100644 --- a/harbour/include/inkey.ch +++ b/harbour/include/inkey.ch @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + #define INKEY_MOVE 1 #define INKEY_LDOWN 2 #define INKEY_LUP 4 diff --git a/harbour/include/item.api b/harbour/include/item.api index 7796282d4a..c47e9b330f 100644 --- a/harbour/include/item.api +++ b/harbour/include/item.api @@ -1,7 +1,11 @@ -#ifndef __ITEM_API -#define __ITEM_API +/* + * $Id$ + */ -#include +#ifndef HB_ITEM_API_ +#define HB_ITEM_API_ + +#include #define _arrayNew hb_arrayNew #define _arrayLen hb_arrayLen @@ -39,4 +43,4 @@ #define _itemSize hb_itemSize #define _itemType hb_itemType -#endif +#endif /* HB_ITEM_API_ */ diff --git a/harbour/include/itemapi.h b/harbour/include/itemapi.h index 2a234117b5..4be831365c 100644 --- a/harbour/include/itemapi.h +++ b/harbour/include/itemapi.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef ITEMAPI_H_ -#define ITEMAPI_H_ +#ifndef HB_ITEMAPI_H_ +#define HB_ITEMAPI_H_ #include @@ -44,4 +44,4 @@ PHB_ITEM hb_itemReturn( PHB_ITEM pItem ); ULONG hb_itemSize( PHB_ITEM pItem ); WORD hb_itemType( PHB_ITEM pItem ); -#endif /* ITEMAPI_H_ */ +#endif /* HB_ITEMAPI_H_ */ diff --git a/harbour/include/pcode.h b/harbour/include/pcode.h index 57691d4640..f3438de6fd 100644 --- a/harbour/include/pcode.h +++ b/harbour/include/pcode.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef PCODE_H_ -#define PCODE_H_ +#ifndef HB_PCODE_H_ +#define HB_PCODE_H_ #include @@ -76,4 +76,4 @@ typedef enum HB_P_ZERO /* places a zero on the virtual machine stack */ } HB_PCODE; -#endif /* PCODE_H_ */ +#endif /* HB_PCODE_H_ */ diff --git a/harbour/include/rdd.api b/harbour/include/rdd.api index d53b94b3dd..8867df2100 100644 --- a/harbour/include/rdd.api +++ b/harbour/include/rdd.api @@ -1,7 +1,9 @@ -// rdd.api -// -#ifndef _RDD_API -#define _RDD_API +/* + * $Id$ + */ + +#ifndef HB_RDD_API_ +#define HB_RDD_API_ //+ // Harbour project The free Clipper(tm) compatible xbase compiler @@ -960,6 +962,5 @@ BOOL is_inUse( AREAP p); void AttachRDDtoThisWorkarea( AREAP workarea, char *cRDD); ULONG LookupAliasName( char *cAlias ); - -#endif #endif +#endif /* HB_RDD_API_ */ diff --git a/harbour/include/set.ch b/harbour/include/set.ch index 5571df3d1b..980de8c2a7 100644 --- a/harbour/include/set.ch +++ b/harbour/include/set.ch @@ -1,3 +1,6 @@ +/* + * $Id$ + */ #define _SET_ALTERNATE 1 #define _SET_ALTFILE 2 diff --git a/harbour/include/set.h b/harbour/include/set.h index f8b42b4704..4ca20446c7 100644 --- a/harbour/include/set.h +++ b/harbour/include/set.h @@ -2,16 +2,16 @@ * $Id$ */ -#ifndef SET_H_ -#define SET_H_ +#ifndef HB_SET_H_ +#define HB_SET_H_ -#include +#include HARBOUR HB_SET (void); HARBOUR HB_SETCENTURY (void); HARBOUR HB_SETFIXED (void); -void InitializeSets (void); -void ReleaseSets (void); +void hb_setInitialize (void); +void hb_setRelease (void); typedef enum { @@ -125,4 +125,4 @@ extern BOOL hb_set_fixed; extern int hb_set_althan; extern int hb_set_printhan; -#endif /* SET_H_ */ +#endif /* HB_SET_H_ */ diff --git a/harbour/include/test.ch b/harbour/include/test.ch deleted file mode 100644 index 0292dee5be..0000000000 --- a/harbour/include/test.ch +++ /dev/null @@ -1,3 +0,0 @@ -// Test include file -// -#define _HARBOUR_VERS 23.2 diff --git a/harbour/include/version.h b/harbour/include/version.h index 567080676c..877e56877d 100644 --- a/harbour/include/version.h +++ b/harbour/include/version.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef VERSION_H_ -#define VERSION_H_ +#ifndef HB_VER_H_ +#define HB_VER_H_ /* extern int hb_major; @@ -23,4 +23,4 @@ #define hb_month 6 /* Build month */ #define hb_day 24 /* Build day */ -#endif /* VERSION_H_ */ +#endif /* HB_VER_H_ */ diff --git a/harbour/makefile.b16 b/harbour/makefile.b16 index c999616e6c..3378c99217 100644 --- a/harbour/makefile.b16 +++ b/harbour/makefile.b16 @@ -22,41 +22,41 @@ libs\b16\terminal.lib : console.obj libs\win16\terminal.lib : console.obj -console.obj : console.c extend.h types.h +console.obj : console.c extend.h hbdefs.h bcc -c -O2 -I.\include -o$@ source\rtl\console.c tlib .\libs\b16\terminal.lib -+$@,, bcc -c -O2 -DWINDOWS -I.\include -o$@ source\rtl\console.c tlib .\libs\win16\terminal.lib -+$@,, - -arrays.obj : arrays.c extend.h types.h -asort.obj : asort.c extend.h types.h -classes.obj : classes.c extend.h types.h -codebloc.obj : codebloc.c extend.h types.h -dates.obj : dates.c extend.h types.h -datesx.obj : datesx.c extend.h types.h -debug.obj : debug.c extend.h types.h -descend.obj : descend.c extend.h types.h -dynsym.obj : dynsym.c extend.h types.h -environ.obj : environ.c extend.h types.h -error.obj : error.c extend.h types.h -errorapi.obj : errorapi.c extend.h types.h -errorsys.obj : errorsys.c extend.h types.h -extend.obj : extend.c extend.h types.h -files.obj : extend.c extend.h types.h -hardcr.obj : hardcr.c extend.h types.h -initsymb.obj : initsymb.c extend.h types.h -itemapi.obj : itemapi.c extend.h types.h -math.obj : math.c extend.h types.h -mathx.obj : mathx.c extend.h types.h -mtran.obj : mtran.c extend.h types.h -objfunc.obj : objfunc.c extend.h types.h -set.obj : set.c extend.h types.h -strcmp.obj : strcmp.c extend.h types.h -stringp.obj : stringp.c extend.h types.h -strings.obj : strings.c extend.h types.h -stringsx.obj : stringsx.c extend.h types.h -tclass.obj : tclass.c extend.h types.h -transfrm.obj : transfrm.c extend.h types.h + +arrays.obj : arrays.c extend.h hbdefs.h +asort.obj : asort.c extend.h hbdefs.h +classes.obj : classes.c extend.h hbdefs.h +codebloc.obj : codebloc.c extend.h hbdefs.h +dates.obj : dates.c extend.h hbdefs.h +datesx.obj : datesx.c extend.h hbdefs.h +debug.obj : debug.c extend.h hbdefs.h +descend.obj : descend.c extend.h hbdefs.h +dynsym.obj : dynsym.c extend.h hbdefs.h +environ.obj : environ.c extend.h hbdefs.h +error.obj : error.c extend.h hbdefs.h +errorapi.obj : errorapi.c extend.h hbdefs.h +errorsys.obj : errorsys.c extend.h hbdefs.h +extend.obj : extend.c extend.h hbdefs.h +files.obj : extend.c extend.h hbdefs.h +hardcr.obj : hardcr.c extend.h hbdefs.h +initsymb.obj : initsymb.c extend.h hbdefs.h +itemapi.obj : itemapi.c extend.h hbdefs.h +math.obj : math.c extend.h hbdefs.h +mathx.obj : mathx.c extend.h hbdefs.h +mtran.obj : mtran.c extend.h hbdefs.h +objfunc.obj : objfunc.c extend.h hbdefs.h +set.obj : set.c extend.h hbdefs.h +strcmp.obj : strcmp.c extend.h hbdefs.h +stringp.obj : stringp.c extend.h hbdefs.h +strings.obj : strings.c extend.h hbdefs.h +stringsx.obj : stringsx.c extend.h hbdefs.h +tclass.obj : tclass.c extend.h hbdefs.h +transfrm.obj : transfrm.c extend.h hbdefs.h asort.c : asort.prg harbour.exe error.c : error.prg harbour.exe diff --git a/harbour/makefile.b31 b/harbour/makefile.b31 index f75c5be99e..e43a7e7f9a 100644 --- a/harbour/makefile.b31 +++ b/harbour/makefile.b31 @@ -35,67 +35,67 @@ terminal.lib : console.obj gtdos.obj libs\win16\terminal.lib : console.obj -console.obj : console.c extend.h types.h ctoharb.h dates.h gtapi.h set.h +console.obj : console.c extend.h hbdefs.h ctoharb.h dates.h gtapi.h set.h bcc -c $(c_opt) -o$@ source\rtl\console.c tlib .\libs\b16\terminal.lib -+$@,, # bcc -c -DWINDOWS $(c_opt) -o$@ source\rtl\console.c # tlib .\libs\win16\terminal.lib -+$@,, -arrays.obj : arrays.c extend.h types.h itemapi.h ctoharb.h -asort.obj : asort.prg extend.h types.h init.h pcode.h harbour.exe -classes.obj : classes.c extend.h types.h itemapi.h -codebloc.obj : codebloc.c extend.h types.h -copyfile.obj : copyfile.c extend.h types.h itemapi.h errorapi.h error.ch filesys.h fileio.ch filesys.api -dates.obj : dates.c extend.h types.h dates.h set.h -descend.obj : descend.c extend.h types.h -environ.obj : environ.c extend.h types.h -error.obj : error.prg extend.h types.h init.h pcode.h harbour.exe -errorapi.obj : errorapi.c extend.h types.h ctoharb.h -errorsys.obj : errorsys.prg extend.h types.h init.h pcode.h harbour.exe -extend.obj : extend.c extend.h types.h set.h -files.obj : extend.c extend.h types.h -gtapi.obj : gtapi.c extend.h types.h gtapi.h -hardcr.obj : hardcr.c extend.h types.h -itemapi.obj : itemapi.c extend.h types.h ctoharb.h itemapi.h set.h -math.obj : math.c extend.h types.h -mtran.obj : mtran.c extend.h types.h -objfunc.obj : objfunc.prg extend.h types.h init.h pcode.h harbour.exe -set.obj : set.c extend.h types.h set.h -strcmp.obj : strcmp.c extend.h types.h set.h -strings.obj : strings.c extend.h types.h set.h +arrays.obj : arrays.c extend.h hbdefs.h itemapi.h ctoharb.h +asort.obj : asort.prg extend.h hbdefs.h init.h pcode.h harbour.exe +classes.obj : classes.c extend.h hbdefs.h itemapi.h +codebloc.obj : codebloc.c extend.h hbdefs.h +copyfile.obj : copyfile.c extend.h hbdefs.h itemapi.h errorapi.h error.ch filesys.h fileio.ch filesys.api +dates.obj : dates.c extend.h hbdefs.h dates.h set.h +descend.obj : descend.c extend.h hbdefs.h +environ.obj : environ.c extend.h hbdefs.h +error.obj : error.prg extend.h hbdefs.h init.h pcode.h harbour.exe +errorapi.obj : errorapi.c extend.h hbdefs.h ctoharb.h +errorsys.obj : errorsys.prg extend.h hbdefs.h init.h pcode.h harbour.exe +extend.obj : extend.c extend.h hbdefs.h set.h dates.h +files.obj : extend.c extend.h hbdefs.h +gtapi.obj : gtapi.c extend.h hbdefs.h gtapi.h +hardcr.obj : hardcr.c extend.h hbdefs.h +itemapi.obj : itemapi.c extend.h hbdefs.h ctoharb.h itemapi.h set.h dates.h +math.obj : math.c extend.h hbdefs.h +mtran.obj : mtran.c extend.h hbdefs.h +objfunc.obj : objfunc.prg extend.h hbdefs.h init.h pcode.h harbour.exe +set.obj : set.c extend.h hbdefs.h set.h +strcmp.obj : strcmp.c extend.h hbdefs.h set.h +strings.obj : strings.c extend.h hbdefs.h set.h symbols.obj : symbols.asm -tclass.obj : tclass.prg extend.h types.h init.h pcode.h harbour.exe -transfrm.obj : transfrm.c extend.h types.h ctoharb.h set.h +tclass.obj : tclass.prg extend.h hbdefs.h init.h pcode.h harbour.exe +transfrm.obj : transfrm.c extend.h hbdefs.h ctoharb.h set.h dates.h -gtdos.obj : source\rtl\gt\gtdos.c extend.h types.h gtapi.h +gtdos.obj : source\rtl\gt\gtdos.c extend.h hbdefs.h gtapi.h -dynsym.obj : source\vm\dynsym.c extend.h types.h -initsymb.obj : source\vm\initsymb.c extend.h types.h +dynsym.obj : source\vm\dynsym.c extend.h hbdefs.h +initsymb.obj : source\vm\initsymb.c extend.h hbdefs.h -datesx.obj : source\tools\datesx.c extend.h types.h -debug.obj : source\tools\debug.c extend.h types.h ctoharb.h itemapi.h -io.obj : source\tools\io.c extend.h types.h -mathx.obj : source\tools\mathx.c extend.h types.h -stringp.obj : source\tools\stringp.prg extend.h types.h init.h pcode.h harbour.exe -stringsx.obj : source\tools\stringsx.c extend.h types.h +datesx.obj : source\tools\datesx.c extend.h hbdefs.h +debug.obj : source\tools\debug.c extend.h hbdefs.h ctoharb.h itemapi.h +io.obj : source\tools\io.c extend.h hbdefs.h +mathx.obj : source\tools\mathx.c extend.h hbdefs.h +stringp.obj : source\tools\stringp.prg extend.h hbdefs.h init.h pcode.h harbour.exe +stringsx.obj : source\tools\stringsx.c extend.h hbdefs.h -asciisum.obj : source\tools\asciisum.c extend.h types.h -ascpos.obj : source\tools\ascpos.c extend.h types.h -atdiff.obj : source\tools\atdiff.c extend.h types.h -chareven.obj : source\tools\chareven.c extend.h types.h -charmix.obj : source\tools\charmix.c extend.h types.h -charodd.obj : source\tools\charodd.c extend.h types.h -chrcount.obj : source\tools\chrcount.c extend.h types.h -chrfirst.obj : source\tools\chrfirst.c extend.h types.h -chrtotal.obj : source\tools\chrtotal.c extend.h types.h -strasint.obj : source\tools\strasint.c extend.h types.h -strcount.obj : source\tools\strcount.c extend.h types.h -strcspn.obj : source\tools\strcspn.c extend.h types.h -strdiff.obj : source\tools\strdiff.c extend.h types.h -strexpan.obj : source\tools\strexpan.c extend.h types.h -strleft.obj : source\tools\strleft.c extend.h types.h -strpbrk.obj : source\tools\strpbrk.c extend.h types.h -strright.obj : source\tools\strright.c extend.h types.h +asciisum.obj : source\tools\asciisum.c extend.h hbdefs.h +ascpos.obj : source\tools\ascpos.c extend.h hbdefs.h +atdiff.obj : source\tools\atdiff.c extend.h hbdefs.h +chareven.obj : source\tools\chareven.c extend.h hbdefs.h +charmix.obj : source\tools\charmix.c extend.h hbdefs.h +charodd.obj : source\tools\charodd.c extend.h hbdefs.h +chrcount.obj : source\tools\chrcount.c extend.h hbdefs.h +chrfirst.obj : source\tools\chrfirst.c extend.h hbdefs.h +chrtotal.obj : source\tools\chrtotal.c extend.h hbdefs.h +strasint.obj : source\tools\strasint.c extend.h hbdefs.h +strcount.obj : source\tools\strcount.c extend.h hbdefs.h +strcspn.obj : source\tools\strcspn.c extend.h hbdefs.h +strdiff.obj : source\tools\strdiff.c extend.h hbdefs.h +strexpan.obj : source\tools\strexpan.c extend.h hbdefs.h +strleft.obj : source\tools\strleft.c extend.h hbdefs.h +strpbrk.obj : source\tools\strpbrk.c extend.h hbdefs.h +strright.obj : source\tools\strright.c extend.h hbdefs.h {source\tools}.prg{obj}.obj: bin\harbour $< /n /osource\tools diff --git a/harbour/makefile.b32 b/harbour/makefile.b32 index b6f8dc2f4b..b3589c7b1f 100644 --- a/harbour/makefile.b32 +++ b/harbour/makefile.b32 @@ -23,39 +23,39 @@ harbour.lib : arrays.obj asort.obj classes.obj codebloc.obj \ symbols.obj : symbols.asm -copyfile.obj : copyfile.c extend.h types.h -arrays.obj : arrays.c extend.h types.h -asort.obj : asort.c extend.h types.h -classes.obj : classes.c extend.h types.h -codebloc.obj : codebloc.c extend.h types.h -dates.obj : dates.c extend.h types.h -datesx.obj : datesx.c extend.h types.h -debug.obj : debug.c extend.h types.h -descend.obj : descend.c extend.h types.h -dir.obj : dir.c extend.h types.h -dynsym.obj : dynsym.c extend.h types.h -environ.obj : environ.c extend.h types.h -error.obj : error.c extend.h types.h -errorapi.obj : errorapi.c extend.h types.h -errorsys.obj : errorsys.c extend.h types.h -extend.obj : extend.c extend.h types.h -files.obj : files.c extend.h types.h -hardcr.obj : hardcr.c extend.h types.h -hb_f.obj : hb_f.c extend.h types.h -initsymb.obj : initsymb.c extend.h types.h -itemapi.obj : itemapi.c extend.h types.h -math.obj : math.c extend.h types.h -mathx.obj : mathx.c extend.h types.h -msguk.obj : msguk.c extend.h types.h -mtran.obj : mtran.c extend.h types.h -objfunc.obj : objfunc.c extend.h types.h -set.obj : set.c extend.h types.h -strcmp.obj : strcmp.c extend.h types.h -stringp.obj : stringp.c extend.h types.h -strings.obj : strings.c extend.h types.h -stringsx.obj : stringsx.c extend.h types.h -tclass.obj : tclass.c extend.h types.h -transfrm.obj : transfrm.c extend.h types.h +copyfile.obj : copyfile.c extend.h hbdefs.h +arrays.obj : arrays.c extend.h hbdefs.h +asort.obj : asort.c extend.h hbdefs.h +classes.obj : classes.c extend.h hbdefs.h +codebloc.obj : codebloc.c extend.h hbdefs.h +dates.obj : dates.c extend.h hbdefs.h +datesx.obj : datesx.c extend.h hbdefs.h +debug.obj : debug.c extend.h hbdefs.h +descend.obj : descend.c extend.h hbdefs.h +dir.obj : dir.c extend.h hbdefs.h +dynsym.obj : dynsym.c extend.h hbdefs.h +environ.obj : environ.c extend.h hbdefs.h +error.obj : error.c extend.h hbdefs.h +errorapi.obj : errorapi.c extend.h hbdefs.h +errorsys.obj : errorsys.c extend.h hbdefs.h +extend.obj : extend.c extend.h hbdefs.h +files.obj : files.c extend.h hbdefs.h +hardcr.obj : hardcr.c extend.h hbdefs.h +hb_f.obj : hb_f.c extend.h hbdefs.h +initsymb.obj : initsymb.c extend.h hbdefs.h +itemapi.obj : itemapi.c extend.h hbdefs.h +math.obj : math.c extend.h hbdefs.h +mathx.obj : mathx.c extend.h hbdefs.h +msguk.obj : msguk.c extend.h hbdefs.h +mtran.obj : mtran.c extend.h hbdefs.h +objfunc.obj : objfunc.c extend.h hbdefs.h +set.obj : set.c extend.h hbdefs.h +strcmp.obj : strcmp.c extend.h hbdefs.h +stringp.obj : stringp.c extend.h hbdefs.h +strings.obj : strings.c extend.h hbdefs.h +stringsx.obj : stringsx.c extend.h hbdefs.h +tclass.obj : tclass.c extend.h hbdefs.h +transfrm.obj : transfrm.c extend.h hbdefs.h asort.c : asort.prg harbour.exe error.c : error.prg harbour.exe diff --git a/harbour/makefile.icc b/harbour/makefile.icc index 1e62f4c45c..126057497d 100644 --- a/harbour/makefile.icc +++ b/harbour/makefile.icc @@ -78,100 +78,100 @@ $(path_lib)\terminal.lib :$(path_obj)\console.obj \ $(path_obj)\gtos2.obj @echo terminal.lib -$(path_obj)\console.obj : {$(path_c)}console.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\gtapi.h $(path_h)\ctoharb.h $(path_h)\dates.h $(path_h)\set.h +$(path_obj)\console.obj : {$(path_c)}console.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\gtapi.h $(path_h)\ctoharb.h $(path_h)\dates.h $(path_h)\set.h icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\console.c ilib .\libs\icc\terminal.lib -+$@,, -$(path_obj)\gtos2.obj : {$(path_c)}gtos2.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\gtapi.h +$(path_obj)\gtos2.obj : {$(path_c)}gtos2.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\gtapi.h icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\gt\gtos2.c ilib .\libs\icc\terminal.lib -+$@,, -$(path_obj)\arrays.obj : {$(path_c)}arrays.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\itemapi.h $(path_h)\errorapi.h $(path_h)\ctoharb.h $(path_h)\error.ch -$(path_obj)\classes.obj : {$(path_c)}classes.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\errorapi.h $(path_h)\ctoharb.h $(path_h)\error.ch -$(path_obj)\codebloc.obj : {$(path_c)}codebloc.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\itemapi.h -$(path_obj)\copyfile.obj : {$(path_c)}copyfile.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\itemapi.h $(path_h)\errorapi.h $(path_h)\error.ch $(path_h)\filesys.h $(path_h)\fileio.ch $(path_h)\filesys.api -$(path_obj)\dates.obj : {$(path_c)}dates.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\dates.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\error.ch -$(path_obj)\datesx.obj : {$(path_c)}datesx.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\debug.obj : {$(path_c)}debug.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\itemapi.h $(path_h)\ctoharb.h -$(path_obj)\descend.obj : {$(path_c)}descend.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\dir.obj : {$(path_c)}dir.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\itemapi.h -$(path_obj)\environ.obj : {$(path_c)}environ.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\version.h -$(path_obj)\errorapi.obj : {$(path_c)}errorapi.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\errorapi.h $(path_h)\error.ch $(path_h)\ctoharb.h -$(path_obj)\extend.obj : {$(path_c)}extend.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\set.h -$(path_obj)\files.obj : {$(path_c)}files.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\gtapi.obj : {$(path_c)}gtapi.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\gtapi.h -$(path_obj)\hardcr.obj : {$(path_c)}hardcr.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\hb_f.obj : {$(path_c)}hb_f.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\filesys.h -$(path_obj)\io.obj : {$(path_c)}io.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\filesys.h -$(path_obj)\initsymb.obj : {$(path_c)}initsymb.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\itemapi.obj : {$(path_c)}itemapi.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\itemapi.h $(path_h)\set.h $(path_h)\ctoharb.h -$(path_obj)\math.obj : {$(path_c)}math.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\errorapi.h $(path_h)\error.ch -$(path_obj)\mathx.obj : {$(path_c)}mathx.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\mtran.obj : {$(path_c)}mtran.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\set.obj : {$(path_c)}set.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\error.ch -$(path_obj)\strcmp.obj : {$(path_c)}strcmp.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\set.h -$(path_obj)\strings.obj : {$(path_c)}strings.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\error.ch -$(path_obj)\stringsx.obj : {$(path_c)}stringsx.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\transfrm.obj : {$(path_c)}transfrm.c $(path_h)\extend.h $(path_h)\types.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\ctoharb.h $(path_h)\error.ch +$(path_obj)\arrays.obj : {$(path_c)}arrays.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h $(path_h)\errorapi.h $(path_h)\ctoharb.h $(path_h)\error.ch +$(path_obj)\classes.obj : {$(path_c)}classes.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\errorapi.h $(path_h)\ctoharb.h $(path_h)\error.ch +$(path_obj)\codebloc.obj : {$(path_c)}codebloc.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h +$(path_obj)\copyfile.obj : {$(path_c)}copyfile.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h $(path_h)\errorapi.h $(path_h)\error.ch $(path_h)\filesys.h $(path_h)\fileio.ch $(path_h)\filesys.api +$(path_obj)\dates.obj : {$(path_c)}dates.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\dates.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\error.ch +$(path_obj)\datesx.obj : {$(path_c)}datesx.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\debug.obj : {$(path_c)}debug.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h $(path_h)\ctoharb.h +$(path_obj)\descend.obj : {$(path_c)}descend.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\dir.obj : {$(path_c)}dir.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h +$(path_obj)\environ.obj : {$(path_c)}environ.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\version.h +$(path_obj)\errorapi.obj : {$(path_c)}errorapi.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\errorapi.h $(path_h)\error.ch $(path_h)\ctoharb.h +$(path_obj)\extend.obj : {$(path_c)}extend.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h $(path_h)\dates.h +$(path_obj)\files.obj : {$(path_c)}files.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\gtapi.obj : {$(path_c)}gtapi.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\gtapi.h +$(path_obj)\hardcr.obj : {$(path_c)}hardcr.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\hb_f.obj : {$(path_c)}hb_f.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\filesys.h +$(path_obj)\io.obj : {$(path_c)}io.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\filesys.h +$(path_obj)\initsymb.obj : {$(path_c)}initsymb.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\itemapi.obj : {$(path_c)}itemapi.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\itemapi.h $(path_h)\set.h $(path_h)\ctoharb.h $(path_h)\dates.h +$(path_obj)\math.obj : {$(path_c)}math.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\errorapi.h $(path_h)\error.ch +$(path_obj)\mathx.obj : {$(path_c)}mathx.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\mtran.obj : {$(path_c)}mtran.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\set.obj : {$(path_c)}set.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\error.ch +$(path_obj)\strcmp.obj : {$(path_c)}strcmp.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h +$(path_obj)\strings.obj : {$(path_c)}strings.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\error.ch +$(path_obj)\stringsx.obj : {$(path_c)}stringsx.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\transfrm.obj : {$(path_c)}transfrm.c $(path_h)\extend.h $(path_h)\hbdefs.h $(path_h)\set.h $(path_h)\errorapi.h $(path_h)\ctoharb.h $(path_h)\error.ch$(path_h)\dates.h -$(path_obj)\asciisum.obj : {$(path_c)}asciisum.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\ascpos.obj : {$(path_c)}ascpos.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\atdiff.obj : {$(path_c)}atdiff.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\chareven.obj : {$(path_c)}chareven.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\charmix.obj : {$(path_c)}charmix.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\charodd.obj : {$(path_c)}charodd.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\chrcount.obj : {$(path_c)}chrcount.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\chrfirst.obj : {$(path_c)}chrfirst.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\chrtotal.obj : {$(path_c)}chrtotal.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\strasint.obj : {$(path_c)}strasint.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\strcount.obj : {$(path_c)}strcount.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\strcspn.obj : {$(path_c)}strcspn.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\strdiff.obj : {$(path_c)}strdiff.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\strexpan.obj : {$(path_c)}strexpan.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\strleft.obj : {$(path_c)}strleft.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\strpbrk.obj : {$(path_c)}strpbrk.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\strright.obj : {$(path_c)}strright.c $(path_h)\extend.h $(path_h)\types.h +$(path_obj)\asciisum.obj : {$(path_c)}asciisum.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\ascpos.obj : {$(path_c)}ascpos.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\atdiff.obj : {$(path_c)}atdiff.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\chareven.obj : {$(path_c)}chareven.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\charmix.obj : {$(path_c)}charmix.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\charodd.obj : {$(path_c)}charodd.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\chrcount.obj : {$(path_c)}chrcount.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\chrfirst.obj : {$(path_c)}chrfirst.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\chrtotal.obj : {$(path_c)}chrtotal.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\strasint.obj : {$(path_c)}strasint.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\strcount.obj : {$(path_c)}strcount.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\strcspn.obj : {$(path_c)}strcspn.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\strdiff.obj : {$(path_c)}strdiff.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\strexpan.obj : {$(path_c)}strexpan.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\strleft.obj : {$(path_c)}strleft.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\strpbrk.obj : {$(path_c)}strpbrk.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\strright.obj : {$(path_c)}strright.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\msgdut.obj : {$(path_c)}msgdut.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\msggal.obj : {$(path_c)}msggal.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\msgpor.obj : {$(path_c)}msgpor.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\msgspa.obj : {$(path_c)}msgspa.c $(path_h)\extend.h $(path_h)\types.h -$(path_obj)\msguk.obj : {$(path_c)}msguk.c $(path_h)\extend.h $(path_h)\types.h +$(path_obj)\msgdut.obj : {$(path_c)}msgdut.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\msggal.obj : {$(path_c)}msggal.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\msgpor.obj : {$(path_c)}msgpor.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\msgspa.obj : {$(path_c)}msgspa.c $(path_h)\extend.h $(path_h)\hbdefs.h +$(path_obj)\msguk.obj : {$(path_c)}msguk.c $(path_h)\extend.h $(path_h)\hbdefs.h -$(path_obj)\dynsym.obj : source\vm\dynsym.c $(path_h)\extend.h $(path_h)\types.h +$(path_obj)\dynsym.obj : source\vm\dynsym.c $(path_h)\extend.h $(path_h)\hbdefs.h icc /C+ $(c_opt) /Fo$@ /Tpsource\vm\dynsym.c ilib .\libs\icc\harbour.lib -+$@,, -$(path_obj)\asort.obj : {$(path_prg)}\asort.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\types.h {$(path_exe)}harbour.exe +$(path_obj)\asort.obj : {$(path_prg)}\asort.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe $(path_exe)\harbour source\rtl\asort /n /osource\rtl icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\asort.c ilib .\libs\icc\harbour.lib -+$@,, -$(path_obj)\error.obj : {$(path_prg)}\error.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\types.h {$(path_exe)}harbour.exe +$(path_obj)\error.obj : {$(path_prg)}\error.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe $(path_exe)\harbour source\rtl\error /n /osource\rtl icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\error.c ilib .\libs\icc\harbour.lib -+$@,, -$(path_obj)\errorsys.obj : {$(path_prg)}\errorsys.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\types.h {$(path_exe)}harbour.exe +$(path_obj)\errorsys.obj : {$(path_prg)}\errorsys.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe $(path_exe)\harbour source\rtl\errorsys /n /osource\rtl icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\errorsys.c ilib .\libs\icc\harbour.lib -+$@,, -$(path_obj)\objfunc.obj : {$(path_prg)}\objfunc.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\types.h {$(path_exe)}harbour.exe +$(path_obj)\objfunc.obj : {$(path_prg)}\objfunc.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe $(path_exe)\harbour source\rtl\objfunc /n /osource\rtl icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\objfunc.c ilib .\libs\icc\harbour.lib -+$@,, -$(path_obj)\tclass.obj : {$(path_prg)}\tclass.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\types.h {$(path_exe)}harbour.exe +$(path_obj)\tclass.obj : {$(path_prg)}\tclass.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe $(path_exe)\harbour source\rtl\tclass /n /osource\rtl icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\tclass.c ilib .\libs\icc\harbour.lib -+$@,, -$(path_obj)\msguk.obj : {$(path_c)}msguk.c $(path_h)\extend.h $(path_h)\types.h +$(path_obj)\msguk.obj : {$(path_c)}msguk.c $(path_h)\extend.h $(path_h)\hbdefs.h icc /C+ $(c_opt) /Fo$@ /Tpsource\rtl\natmsg\msguk.c ilib .\libs\icc\harbour.lib -+$@,, -$(path_obj)\stringp.obj : {$(path_prg)}\stringp.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\types.h {$(path_exe)}harbour.exe +$(path_obj)\stringp.obj : {$(path_prg)}\stringp.prg $(path_h)\pcode.h $(path_h)\init.h $(path_h)\extend.h $(path_h)\hbdefs.h {$(path_exe)}harbour.exe $(path_exe)\harbour source\tools\stringp /n /osource\tools icc /C+ $(c_opt) /Fo$@ /Tpsource\tools\stringp.c ilib .\libs\icc\hbtools.lib -+$@,, diff --git a/harbour/source/compiler/Makefile b/harbour/source/compiler/Makefile index 25c7aadb41..cce4fd349e 100644 --- a/harbour/source/compiler/Makefile +++ b/harbour/source/compiler/Makefile @@ -10,7 +10,7 @@ YACC_HEADERS=\ compiler.h \ hbsetup.h \ pcode.h \ - types.h \ + hbdefs.h \ hberrors.h \ hbpp.h @@ -19,7 +19,7 @@ LEX_SOURCE=harbour.l LEX_HEADERS=\ hbsetup.h \ hberrors.h \ - types.h + hbdefs.h C_SOURCES=\ genobj32.c \ diff --git a/harbour/source/compiler/genobj32.c b/harbour/source/compiler/genobj32.c index a0135a97bc..d8770b4644 100644 --- a/harbour/source/compiler/genobj32.c +++ b/harbour/source/compiler/genobj32.c @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/harbour/source/compiler/harbour.l b/harbour/source/compiler/harbour.l index 94fbc9002a..9f459a7f44 100644 --- a/harbour/source/compiler/harbour.l +++ b/harbour/source/compiler/harbour.l @@ -17,7 +17,7 @@ #include "harboury.h" #include "hbsetup.h" /* main configuration file */ #include "hberrors.h" -#include "types.h" +#include "hbdefs.h" /* Functions defined in harbour.y */ char *yy_strupr( char * ); diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y index a67096b2b0..dfaccea408 100644 --- a/harbour/source/compiler/harbour.y +++ b/harbour/source/compiler/harbour.y @@ -20,7 +20,7 @@ #include #include "hbsetup.h" /* main configuration file */ #include "pcode.h" /* pcode values */ -#include "types.h" /* our defined types */ +#include "hbdefs.h" /* our defined types */ #include "compiler.h" #include "hberrors.h" #include "hbpp.h" diff --git a/harbour/source/hbpp/harb.h b/harbour/source/hbpp/harb.h index c5b36bf53b..421f86fcf4 100644 --- a/harbour/source/hbpp/harb.h +++ b/harbour/source/hbpp/harb.h @@ -6,7 +6,7 @@ #define HARB_H_ /* --------------------------------------------- - Definitions, copied from Harbour.y and types.h */ + Definitions, copied from Harbour.y and hbdefs.h */ /* * Note: I don't think it is such a great idea to undef LONG... diff --git a/harbour/source/rtl/copyfile.c b/harbour/source/rtl/copyfile.c index 7a3b553f6b..dc079189a6 100644 --- a/harbour/source/rtl/copyfile.c +++ b/harbour/source/rtl/copyfile.c @@ -8,7 +8,7 @@ #include #include -#define BUFFER_SIZE 8096 +#define BUFFER_SIZE 8192 static long hb_fsCopy(BYTEP ,BYTEP ) ; diff --git a/harbour/source/rtl/dates.c b/harbour/source/rtl/dates.c index b8f16c5b7e..392f3e2165 100644 --- a/harbour/source/rtl/dates.c +++ b/harbour/source/rtl/dates.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #if defined(__TURBOC__) || defined(__BORLANDC__) || defined(__DJGPP__) diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errorapi.c index 6b02dac03e..65aff798bc 100644 --- a/harbour/source/rtl/errorapi.c +++ b/harbour/source/rtl/errorapi.c @@ -254,7 +254,7 @@ PHB_ITEM hb_errPutFlags( PHB_ITEM pError, USHORT uiFlags ) /* Wrappers for hb_errLaunch() */ -void hb_errorRT_BASE( ULONG ulGenCode, ULONG ulSubCode, char* szDescription, char* szOperation ) +WORD hb_errorRT_BASE( ULONG ulGenCode, ULONG ulSubCode, char* szDescription, char* szOperation ) { PHB_ITEM pError = hb_errNew(); @@ -266,6 +266,6 @@ void hb_errorRT_BASE( ULONG ulGenCode, ULONG ulSubCode, char* szDescription, cha hb_errPutOperation( pError, szOperation ); hb_errLaunch( pError ); - hb_errRelease( pError ); + return hb_errRelease( pError ); } diff --git a/harbour/source/rtl/extend.c b/harbour/source/rtl/extend.c index a70ba90414..c8b7dafac8 100644 --- a/harbour/source/rtl/extend.c +++ b/harbour/source/rtl/extend.c @@ -6,6 +6,7 @@ #include #include #include +#include extern STACK stack; diff --git a/harbour/source/rtl/hardcr.c b/harbour/source/rtl/hardcr.c index 78148939b4..69f5e20af3 100644 --- a/harbour/source/rtl/hardcr.c +++ b/harbour/source/rtl/hardcr.c @@ -36,14 +36,8 @@ char *hb_hardcr( char *string ) HARBOUR HB_HARDCR( void ) { - if( hb_pcount() == 1 ) - { - PHB_ITEM pItem = hb_param(1, IT_STRING ); - - if( pItem ) - { - if( IS_STRING( pItem ) ) - hb_retc( hb_hardcr( pItem->value.szText ) ); - } - } + if( ISCHAR( 1 ) ) + hb_retc( hb_hardcr( hb_parc( 1 ) ) ); + else + hb_retc( "" ); } diff --git a/harbour/source/rtl/itemapi.c b/harbour/source/rtl/itemapi.c index 7e3b794257..3837f13f8e 100644 --- a/harbour/source/rtl/itemapi.c +++ b/harbour/source/rtl/itemapi.c @@ -5,18 +5,12 @@ #include #include #include +#include #include extern STACK stack; extern SYMBOL symEval; -#if 0 -/* TODO: Someone make a dates.h so this isn't necessary! */ -long greg2julian( long lDay, long lMonth, long lYear ); -extern void julian2greg( long julian, - long * plDay, long * plMonth, long * plYear ); -#endif - BOOL hb_evalNew( PEVALINFO pEvalInfo, PHB_ITEM pItem ) { BOOL bResult = FALSE; diff --git a/harbour/source/rtl/mtran.c b/harbour/source/rtl/mtran.c index 04b9e6f21c..34eb7abd20 100644 --- a/harbour/source/rtl/mtran.c +++ b/harbour/source/rtl/mtran.c @@ -30,10 +30,12 @@ char *hb_memotran( char *string, char *hardcr, char *softcr ) if( string ) { for( s = string; *s; ++s ) + { if( *s == CHR_HARD1 && *(s+1) == CHR_HARD2 ) *s++ = *hardcr; if( *s == CHR_SOFT1 && *(s+1) == CHR_SOFT2 ) *s++ = *softcr; + } *s = '\0'; } @@ -42,22 +44,13 @@ char *hb_memotran( char *string, char *hardcr, char *softcr ) HARBOUR HB_MEMOTRAN( void ) { - if( hb_pcount() == 1 ) + if( ISCHAR( 1 ) ) { - PHB_ITEM pItem = hb_param(1, IT_STRING ); + char *hardcr = ISCHAR( 2 ) ? hb_parc( 2 ):";"; + char *softcr = ISCHAR( 3 ) ? hb_parc( 3 ):" "; - if( pItem ) - { - if( IS_STRING( pItem ) ) - { - PHB_ITEM pItem2 = hb_param(2, IT_STRING ); - PHB_ITEM pItem3 = hb_param(3, IT_STRING ); - - char *hardcr = ( pItem2 ) ? pItem2->value.szText:";"; - char *softcr = ( pItem3 ) ? pItem3->value.szText:" "; - - hb_retc( hb_memotran( pItem->value.szText, hardcr, softcr ) ); - } - } + hb_retc( hb_memotran( hb_parc( 1 ), hardcr, softcr ) ); } + else + hb_retc( "" ); } diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c index 1738a3f66f..d16d10da83 100644 --- a/harbour/source/rtl/set.c +++ b/harbour/source/rtl/set.c @@ -693,7 +693,7 @@ HARBOUR HB_SET (void) } } -void InitializeSets (void) +void hb_setInitialize (void) { hb_set_century = FALSE; hb_set_fixed = FALSE; @@ -747,7 +747,7 @@ void InitializeSets (void) hb_set.HB_SET_WRAP = FALSE; } -void ReleaseSets (void) +void hb_setRelease (void) { if (hb_set_althan != -1) close_text (hb_set_althan); if (hb_set_printhan != -1) close_binary (hb_set_printhan); diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c index e57d962034..9a6fe3e68c 100644 --- a/harbour/source/rtl/transfrm.c +++ b/harbour/source/rtl/transfrm.c @@ -6,6 +6,7 @@ #include #include #include +#include #include /* */ diff --git a/harbour/source/vm/initsymb.c b/harbour/source/vm/initsymb.c index 9480a6db45..25f782f143 100644 --- a/harbour/source/vm/initsymb.c +++ b/harbour/source/vm/initsymb.c @@ -8,7 +8,7 @@ #include "hbsetup.h" #include "extend.h" -#include "types.h" +#include "hbdefs.h" extern void Arrays__InitSymbols( void ); extern void Classes__InitSymbols( void ); diff --git a/harbour/terminal.b32 b/harbour/terminal.b32 index f18b74e2c3..7da0e318a4 100644 --- a/harbour/terminal.b32 +++ b/harbour/terminal.b32 @@ -10,10 +10,10 @@ libs\b32\terminal.lib : console.obj gtapi.obj gtdos.obj libs\win32\terminal.lib : console.obj gtapi.obj gtwin.obj -console.obj : console.c extend.h types.h -gtapi.obj : gtapi.c extend.h types.h -gtdos.obj : gtdos.c extend.h types.h -gtwin.obj : gtwin.c extend.h types.h +console.obj : console.c extend.h hbdefs.h +gtapi.obj : gtapi.c extend.h hbdefs.h +gtdos.obj : gtdos.c extend.h hbdefs.h +gtwin.obj : gtwin.c extend.h hbdefs.h .c.obj: bcc32 -wmsg -c -O2 -I.\include -o$@ $< diff --git a/harbour/tests/working/hscript/cgi.ch b/harbour/tests/working/hscript/cgi.ch new file mode 100644 index 0000000000..577cea074f --- /dev/null +++ b/harbour/tests/working/hscript/cgi.ch @@ -0,0 +1,32 @@ +// CGI.ch + +//+ +// Harbour project +// +// +// 99.05.31 initial posting. +// +// +//- + + +#define CGI_SERVER_SOFTWARE 01 +#define CGI_SERVER_NAME 02 +#define CGI_GATEWAY_INTERFACE 03 +#define CGI_SERVER_PROTOCOL 04 +#define CGI_SERVER_PORT 05 +#define CGI_REQUEST_METHOD 06 +#define CGI_HTTP_ACCEPT 07 +#define CGI_HTTP_USER_AGENT 08 +#define CGI_HTTP_REFERER 09 +#define CGI_PATH_INFO 10 +#define CGI_PATH_TRANSLATED 11 +#define CGI_SCRIPT_NAME 12 +#define CGI_QUERY_STRING 13 +#define CGI_REMOTE_HOST 14 +#define CGI_REMOTE_ADDR 15 +#define CGI_REMOTE_USER 16 +#define CGI_AUTH_TYPE 17 +#define CGI_CONTENT_TYPE 18 +#define CGI_CONTENT_LENGTH 19 +#define CGI_ANNOTATION_SERVER 20