From f85f1fa13ce303424423d0b042d973f907c76816 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 3 Jun 2000 11:33:06 +0000 Subject: [PATCH] 2000-06-03 13:36 UTC+0100 Victor Szakats --- harbour/ChangeLog | 14 ++++++++++++++ harbour/include/hbcomp.h | 8 ++++---- harbour/makefile.bc | 8 +++++++- harbour/source/common/hbver.c | 8 ++++---- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 943589af27..ac0b7c443d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,17 @@ +2000-06-03 13:36 UTC+0100 Victor Szakats + + * makefile.bc + + Added a kludge to make it work with Borland C++ 5.3 + You'll have to run make with -DBCC_NOSTARTUP. + + * source/common/hbver.c + * hb_verBuildInfo() Changed to display the platform info after the + compiler version, because on some platform/OS/combinations (RSXNT,EMX) + the program crashes on platform detection. + + * include/hbcomp.h + * Minor formatting + 2000-06-03 10:53 UTC+0100 Victor Szakats * source/debug/* diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h index 276ef206fc..50a3d7a4e6 100644 --- a/harbour/include/hbcomp.h +++ b/harbour/include/hbcomp.h @@ -138,16 +138,16 @@ typedef struct __FUNC ULONG lPCodeSize; /* total memory size for pcode */ ULONG lPCodePos; /* actual pcode offset */ int iStaticsBase; /* base for this function statics */ - ULONG * pNOOPs; /* pointer to the NOOP array */ - ULONG * pJumps; /* pointer to the Jumps array */ + ULONG * pNOOPs; /* pointer to the NOOP array */ + ULONG * pJumps; /* pointer to the Jumps array */ ULONG iNOOPs; /* NOOPs Counter */ ULONG iJumps; /* Jumps Counter */ BYTE * pStack; /* Compile Time Stack */ USHORT iStackSize; /* Compile Time Stack size */ int iStackIndex; /* Compile Time Stack index */ - PCOMDECLARED pStackFunctions[8]; /* Declared Functions on the Compile Time Stack */ + PCOMDECLARED pStackFunctions[ 8 ]; /* Declared Functions on the Compile Time Stack */ int iStackFunctions; /* Index into DEclared Functions on Compile Time Stack */ - PCOMCLASS pStackClasses[8]; /* Declared Classes on the Compile Time Stack */ + PCOMCLASS pStackClasses[ 8 ]; /* Declared Classes on the Compile Time Stack */ int iStackClasses; /* Index into Declared Classes on Compile Time Stack */ struct __FUNC * pOwner; /* pointer to the function/procedure that owns the codeblock */ struct __FUNC * pNext; /* pointer to the next defined function */ diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 734588e893..398a974c47 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -27,8 +27,14 @@ # with external commands named echo. # +# +# NOTE: BCC_NOSTARTUP must be defined for Borland C++ 5.3 to make it work. +# + !if $d(B16) +BCC_NOSTARTUP = "" + CC = bcc AS = tasm @@ -445,7 +451,7 @@ VM_LIB_OBJS = \ \ $(OBJ_DIR)\harbinit.obj -!if !$d(B16) +!if ! $d(BCC_NOSTARTUP) VM_LIB_OBJS = $(VM_LIB_OBJS) \ $(OBJ_DIR)\startup.obj !endif diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c index f4644a7b8d..cc07745253 100644 --- a/harbour/source/common/hbver.c +++ b/harbour/source/common/hbver.c @@ -411,16 +411,16 @@ void hb_verBuildInfo( void ) } { - char * pszVersion = hb_verPlatform(); - hb_conOutErr( "Platform: ", 0 ); + char * pszVersion = hb_verCompiler(); + hb_conOutErr( "Compiler: ", 0 ); hb_conOutErr( pszVersion, 0 ); hb_conOutErr( hb_conNewLine(), 0 ); hb_xfree( pszVersion ); } { - char * pszVersion = hb_verCompiler(); - hb_conOutErr( "Compiler: ", 0 ); + char * pszVersion = hb_verPlatform(); + hb_conOutErr( "Platform: ", 0 ); hb_conOutErr( pszVersion, 0 ); hb_conOutErr( hb_conNewLine(), 0 ); hb_xfree( pszVersion );