fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-08-30 11:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* include/hbsetup.ch
     + Added HB_LEGACY_OFF macro to turn off HB_LEGACY_LEVEL.

   * utils/hbmake/hbmake.prg
     * Two minor cleanups.

   * doc/en/hb_apiit.txt
   * source/vm/eval.c
     * PEVALINFO -> PHB_EVALINFO
     * EVALINFO -> HB_EVALINFO

   * contrib/hbct/ctwin.c
   * contrib/hbct/keyset.c
   * contrib/hbct/misc3.c
   * contrib/hbnf/numlock.c
   * contrib/hbnf/shift.c
   * contrib/hbnf/alt.c
   * contrib/hbnf/ctrl.c
   * contrib/hbnf/caplock.c
     * GTI_* -> HB_GTI_*

   * source/rtl/spfiles.c
     * FHANDLE -> HB_FHANDLE
This commit is contained in:
Viktor Szakats
2008-08-30 10:21:22 +00:00
parent 5f33ef7f7d
commit ffdf363493
14 changed files with 81 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
harbour/ChangeLog
View File

@@ -8,6 +8,31 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-08-30 11:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* include/hbsetup.ch
+ Added HB_LEGACY_OFF macro to turn off HB_LEGACY_LEVEL.
* utils/hbmake/hbmake.prg
* Two minor cleanups.
* doc/en/hb_apiit.txt
* source/vm/eval.c
* PEVALINFO -> PHB_EVALINFO
* EVALINFO -> HB_EVALINFO
* contrib/hbct/ctwin.c
* contrib/hbct/keyset.c
* contrib/hbct/misc3.c
* contrib/hbnf/numlock.c
* contrib/hbnf/shift.c
* contrib/hbnf/alt.c
* contrib/hbnf/ctrl.c
* contrib/hbnf/caplock.c
* GTI_* -> HB_GTI_*
* source/rtl/spfiles.c
* FHANDLE -> HB_FHANDLE
2008-08-29 14:45 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmake/hbmake.prg
; Applied patch created by Bill Robertson:
@@ -462,7 +487,7 @@
* source/compiler/hbmain.c
! Text casing fixed in some warning messages.
! Attempted to update hardcoded declarations for TGET methods.
Some of the were removed, for some of them the parameter list
Some of them were removed, for some of them the parameter list
was updated to be in sync with current tget.prg.
* contrib/gtalleg/gtalleg.c
@@ -1611,7 +1636,6 @@
- UINT64, UINT64_MAX
- ULONG, ULONG_MAX
- ULONGLONG, ULONGLONG_MAX
- assert()
; Some hacks currently used:
- HB_DONT_DEFINE_BASIC_TYPES
- HB_DONT_DEFINE_BOOL

12
harbour/contrib/hbct/ctwin.c
View File

@@ -1427,11 +1427,11 @@ static BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch ( iType )
{
case GTI_ISCTWIN:
case HB_GTI_ISCTWIN:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_NEWWIN:
case HB_GTI_NEWWIN:
{
BOOL fResult;
@@ -1443,7 +1443,7 @@ static BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
s_iCurrWindow );
return fResult;
}
case GTI_GETWIN:
case HB_GTI_GETWIN:
{
BOOL fResult;
int iWindow = s_iCurrWindow;
@@ -1454,7 +1454,7 @@ static BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
hb_itemPutNI( hb_arrayGetItemPtr( pInfo->pResult, 8 ), iWindow );
return fResult;
}
case GTI_SETWIN:
case HB_GTI_SETWIN:
{
BOOL fResult;
@@ -1492,9 +1492,9 @@ static int hb_ctw_gt_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
{
HB_GT_INFO gtInfo;
gtInfo.pNewVal = gtInfo.pResult = NULL;
HB_GTSELF_INFO( pGT, GTI_FULLSCREEN, &gtInfo );
HB_GTSELF_INFO( pGT, HB_GTI_FULLSCREEN, &gtInfo );
fScreen = gtInfo.pResult && hb_itemGetL( gtInfo.pResult );
HB_GTSELF_INFO( pGT, GTI_KBDSUPPORT, &gtInfo );
HB_GTSELF_INFO( pGT, HB_GTI_KBDSUPPORT, &gtInfo );
if( gtInfo.pResult )
{
if( !hb_itemGetL( gtInfo.pResult ) )

12
harbour/contrib/hbct/keyset.c
View File

@@ -63,7 +63,7 @@ static void SetGet( int iFlag )
gtInfo.pNewVal = gtInfo.pResult = NULL;
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
if( gtInfo.pResult )
{
iState = hb_itemGetNI( gtInfo.pResult );
@@ -75,7 +75,7 @@ static void SetGet( int iFlag )
{
iNewState = hb_parl( 1 ) ? ( iState | iFlag ) : ( iState & ~iFlag );
gtInfo.pNewVal = hb_itemPutNI( gtInfo.pNewVal, iNewState );
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
}
if( gtInfo.pNewVal )
@@ -114,7 +114,7 @@ static void SetGet( int iFlag )
HB_FUNC( KSETINS )
{
SetGet( GTI_KBD_INSERT );
SetGet( HB_GTI_KBD_INSERT );
}
@@ -145,7 +145,7 @@ HB_FUNC( KSETINS )
HB_FUNC( KSETCAPS )
{
SetGet( GTI_KBD_CAPSLOCK );
SetGet( HB_GTI_KBD_CAPSLOCK );
}
@@ -176,7 +176,7 @@ HB_FUNC( KSETCAPS )
HB_FUNC( KSETNUM )
{
SetGet( GTI_KBD_NUMLOCK );
SetGet( HB_GTI_KBD_NUMLOCK );
}
@@ -207,5 +207,5 @@ HB_FUNC( KSETNUM )
HB_FUNC( KSETSCROLL )
{
SetGet( GTI_KBD_SCROLOCK );
SetGet( HB_GTI_KBD_SCROLOCK );
}

16
harbour/contrib/hbct/misc3.c
View File

@@ -62,26 +62,26 @@ HB_FUNC( KBDSTAT )
gtInfo.pNewVal = NULL;
gtInfo.pResult = NULL;
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
if( gtInfo.pResult )
{
int iState = hb_itemGetNI( gtInfo.pResult );
hb_itemRelease( gtInfo.pResult );
if( iState & GTI_KBD_SHIFT )
if( iState & HB_GTI_KBD_SHIFT )
iRet |= 0x01;
if( iState & GTI_KBD_CTRL )
if( iState & HB_GTI_KBD_CTRL )
iRet |= 0x04;
if( iState & GTI_KBD_ALT )
if( iState & HB_GTI_KBD_ALT )
iRet |= 0x08;
if( iState & GTI_KBD_SCROLOCK )
if( iState & HB_GTI_KBD_SCROLOCK )
iRet |= 0x10;
if( iState & GTI_KBD_NUMLOCK )
if( iState & HB_GTI_KBD_NUMLOCK )
iRet |= 0x20;
if( iState & GTI_KBD_CAPSLOCK )
if( iState & HB_GTI_KBD_CAPSLOCK )
iRet |= 0x40;
if( iState & GTI_KBD_INSERT )
if( iState & HB_GTI_KBD_INSERT )
iRet |= 0x80;
}

4
harbour/contrib/hbnf/alt.c
View File

@@ -70,8 +70,8 @@ HB_FUNC( FT_ALT )
HB_GT_INFO gtInfo;
gtInfo.pNewVal = gtInfo.pResult = NULL;
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_retl( ( hb_itemGetNI( gtInfo.pResult ) & GTI_KBD_ALT ) != 0 );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
hb_retl( ( hb_itemGetNI( gtInfo.pResult ) & HB_GTI_KBD_ALT ) != 0 );
if( gtInfo.pResult )
hb_itemRelease( gtInfo.pResult );
}

10
harbour/contrib/hbnf/caplock.c
View File

@@ -71,7 +71,7 @@ HB_FUNC( FT_CAPLOCK )
HB_GT_INFO gtInfo;
gtInfo.pNewVal = gtInfo.pResult = NULL;
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
if( gtInfo.pResult )
{
iState = hb_itemGetNI( gtInfo.pResult );
@@ -81,10 +81,10 @@ HB_FUNC( FT_CAPLOCK )
if( ISLOG( 1 ) )
{
iNewState = hb_parl( 1 ) ? ( iState | GTI_KBD_CAPSLOCK ) :
( iState & ~GTI_KBD_CAPSLOCK );
iNewState = hb_parl( 1 ) ? ( iState | HB_GTI_KBD_CAPSLOCK ) :
( iState & ~HB_GTI_KBD_CAPSLOCK );
gtInfo.pNewVal = hb_itemPutNI( gtInfo.pNewVal, iNewState );
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
}
if( gtInfo.pNewVal )
@@ -92,5 +92,5 @@ HB_FUNC( FT_CAPLOCK )
if( gtInfo.pResult )
hb_itemRelease( gtInfo.pResult );
hb_retl( ( iState & GTI_KBD_CAPSLOCK ) != 0 );
hb_retl( ( iState & HB_GTI_KBD_CAPSLOCK ) != 0 );
}

4
harbour/contrib/hbnf/ctrl.c
View File

@@ -67,8 +67,8 @@ HB_FUNC( FT_CTRL )
HB_GT_INFO gtInfo;
gtInfo.pNewVal = gtInfo.pResult = NULL;
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_retl( ( hb_itemGetNI( gtInfo.pResult ) & GTI_KBD_CTRL ) != 0 );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
hb_retl( ( hb_itemGetNI( gtInfo.pResult ) & HB_GTI_KBD_CTRL ) != 0 );
if( gtInfo.pResult )
hb_itemRelease( gtInfo.pResult );
}

10
harbour/contrib/hbnf/numlock.c
View File

@@ -82,7 +82,7 @@ HB_FUNC( FT_NUMLOCK )
HB_GT_INFO gtInfo;
gtInfo.pNewVal = gtInfo.pResult = NULL;
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
if( gtInfo.pResult )
{
iState = hb_itemGetNI( gtInfo.pResult );
@@ -92,10 +92,10 @@ HB_FUNC( FT_NUMLOCK )
if( ISLOG( 1 ) )
{
iNewState = hb_parl( 1 ) ? ( iState | GTI_KBD_NUMLOCK ) :
( iState & ~GTI_KBD_NUMLOCK );
iNewState = hb_parl( 1 ) ? ( iState | HB_GTI_KBD_NUMLOCK ) :
( iState & ~HB_GTI_KBD_NUMLOCK );
gtInfo.pNewVal = hb_itemPutNI( gtInfo.pNewVal, iNewState );
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
}
if( gtInfo.pNewVal )
@@ -103,5 +103,5 @@ HB_FUNC( FT_NUMLOCK )
if( gtInfo.pResult )
hb_itemRelease( gtInfo.pResult );
hb_retl( ( iState & GTI_KBD_NUMLOCK ) != 0 );
hb_retl( ( iState & HB_GTI_KBD_NUMLOCK ) != 0 );
}

4
harbour/contrib/hbnf/shift.c
View File

@@ -67,8 +67,8 @@ HB_FUNC( FT_SHIFT )
HB_GT_INFO gtInfo;
gtInfo.pNewVal = gtInfo.pResult = NULL;
hb_gtInfo( GTI_KBDSHIFTS, &gtInfo );
hb_retl( ( hb_itemGetNI( gtInfo.pResult ) & GTI_KBD_SHIFT ) != 0 );
hb_gtInfo( HB_GTI_KBDSHIFTS, &gtInfo );
hb_retl( ( hb_itemGetNI( gtInfo.pResult ) & HB_GTI_KBD_SHIFT ) != 0 );
if( gtInfo.pResult )
hb_itemRelease( gtInfo.pResult );
}

14
harbour/doc/en/hb_apiit.txt
View File

@@ -24,7 +24,7 @@
* C Prototype
*
* #include <hbapiitm.h>
* hb_evalLaunch( PEVALINFO pEvalInfo ) --> ( PHB_ITEM )pResult
* hb_evalLaunch( PHB_EVALINFO pEvalInfo ) --> ( PHB_ITEM )pResult
* $ARGUMENTS$
* <pEvalInfo>
* $RETURNS$
@@ -57,7 +57,7 @@
* C Prototype
*
* #include <hbapiitm.h>
* hb_evalNew( PEVALINFO pEvalInfo, PHB_ITEM pItem ) --> ( BOOL )bResult
* hb_evalNew( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem ) --> ( BOOL ) bResult
* $ARGUMENTS$
* <pEvalInfo>
*
@@ -92,7 +92,7 @@
* C Prototype
*
* #include <hbapiitm.h>
* hb_evalPutParam( PEVALINFO pEvalInfo, PHB_ITEM pItem ) --> ( BOOL )bResult
* hb_evalPutParam( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem ) --> ( BOOL ) bResult
* $ARGUMENTS$
* <pEvalInfo>
*
@@ -127,7 +127,7 @@
* C Prototype
*
* #include <hbapiitm.h>
* hb_evalRelease( PEVALINFO pEvalInfo ) --> ( BOOL )bResult
* hb_evalRelease( PHB_EVALINFO pEvalInfo ) --> ( BOOL ) bResult
* $ARGUMENTS$
* <pEvalInfo>
* $RETURNS$
@@ -380,7 +380,7 @@
* C Prototype
*
* #include <hbapiitm.h>
* hb_itemFreeC( char * szText ) --> ( BOOL )bResult
* hb_itemFreeC( char * szText ) --> ( BOOL ) bResult
* $ARGUMENTS$
* <szText>
* $RETURNS$
@@ -580,7 +580,7 @@
* C Prototype
*
* #include <hbapiitm.h>
* hb_itemGetL( PHB_ITEM pItem ) --> ( BOOL )bResult
* hb_itemGetL( PHB_ITEM pItem ) --> ( BOOL ) bResult
* $ARGUMENTS$
* <pItem>
* $RETURNS$
@@ -1536,7 +1536,7 @@
* C Prototype
*
* #include <hbapiitm.h>
* hb_itemRelease( PHB_ITEM pItem ) --> ( BOOL )bResult
* hb_itemRelease( PHB_ITEM pItem ) --> ( BOOL ) bResult
* $ARGUMENTS$
* <pItem>
* $RETURNS$

4
harbour/include/hbsetup.ch
View File

@@ -79,6 +79,8 @@
* You should modify your 3rd party code to compile without this macro ASAP.
* NOTE: C code using legacy Clipper (.api) headers is unaffected.
*/
#define HB_LEGACY_LEVEL 1
#ifndef HB_LEGACY_OFF
#define HB_LEGACY_LEVEL 1
#endif
#endif /* HB_SETUP_CH_ */

6
harbour/source/rtl/spfiles.c
View File

@@ -122,7 +122,7 @@ BOOL hb_spFile( BYTE * pFilename, BYTE * pRetPath )
return bIsFile;
}
FHANDLE hb_spOpen( BYTE * pFilename, USHORT uiFlags )
HB_FHANDLE hb_spOpen( BYTE * pFilename, USHORT uiFlags )
{
BYTE path[ _POSIX_PATH_MAX + 1 ];
@@ -134,7 +134,7 @@ FHANDLE hb_spOpen( BYTE * pFilename, USHORT uiFlags )
return hb_fsOpen( pFilename, uiFlags );
}
FHANDLE hb_spCreate( BYTE * pFilename, ULONG ulAttr )
HB_FHANDLE hb_spCreate( BYTE * pFilename, ULONG ulAttr )
{
BYTE path[ _POSIX_PATH_MAX + 1 ];
PHB_FNAME pFilepath;
@@ -151,7 +151,7 @@ FHANDLE hb_spCreate( BYTE * pFilename, ULONG ulAttr )
return hb_fsCreate( path, ulAttr );
}
FHANDLE hb_spCreateEx( BYTE * pFilename, ULONG ulAttr, USHORT uiFlags )
HB_FHANDLE hb_spCreateEx( BYTE * pFilename, ULONG ulAttr, USHORT uiFlags )
{
BYTE path[ _POSIX_PATH_MAX + 1 ];
PHB_FNAME pFilepath;

10
harbour/source/vm/eval.c
View File

@@ -69,13 +69,13 @@
#include "hbapierr.h"
#include "hbvm.h"
BOOL hb_evalNew( PEVALINFO pEvalInfo, PHB_ITEM pItem )
BOOL hb_evalNew( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem )
{
HB_TRACE(HB_TR_DEBUG, ("hb_evalNew(%p, %p)", pEvalInfo, pItem));
if( pEvalInfo )
{
memset( pEvalInfo, 0, sizeof( EVALINFO ) );
memset( pEvalInfo, 0, sizeof( HB_EVALINFO ) );
pEvalInfo->pItems[ 0 ] = pItem;
pEvalInfo->paramCount = 0;
@@ -98,7 +98,7 @@ BOOL hb_evalNew( PEVALINFO pEvalInfo, PHB_ITEM pItem )
all, don't release the eval parameter Items explicitly to make both
Harbour and CA-Cl*pper happy. [vszakats] */
BOOL hb_evalPutParam( PEVALINFO pEvalInfo, PHB_ITEM pItem )
BOOL hb_evalPutParam( PHB_EVALINFO pEvalInfo, PHB_ITEM pItem )
{
HB_TRACE(HB_TR_DEBUG, ("hb_evalPutParam(%p, %p)", pEvalInfo, pItem));
@@ -112,7 +112,7 @@ BOOL hb_evalPutParam( PEVALINFO pEvalInfo, PHB_ITEM pItem )
return FALSE;
}
PHB_ITEM hb_evalLaunch( PEVALINFO pEvalInfo )
PHB_ITEM hb_evalLaunch( PHB_EVALINFO pEvalInfo )
{
PHB_ITEM pResult = NULL;
@@ -168,7 +168,7 @@ PHB_ITEM hb_evalLaunch( PEVALINFO pEvalInfo )
once and only once before calling hb_evalRelease(). Harbour doesn't
have these requirements. [vszakats] */
BOOL hb_evalRelease( PEVALINFO pEvalInfo )
BOOL hb_evalRelease( PHB_EVALINFO pEvalInfo )
{
HB_TRACE(HB_TR_DEBUG, ("hb_evalRelease(%p)", pEvalInfo));

4
harbour/utils/hbmake/hbmake.prg
View File

@@ -65,8 +65,6 @@
#define HB_FEOF -1 // hb_FReadLine() returns -1 on End-of-File (EOF)
#xtranslate TimeToSec(<x>) => ( ( Val( Substr( <x>, 1, 2 ) ) * 3600 ) +( Val( Substr( <x>, 4, 2 ) ) * 60 ) + ( Val( Substr( <x>, 7, 2 ) ) ) )
#Define HBM_USE_DEPENDS // Set this to have section #DEPENDS parsed like RMake, Ath 2004-06
// An extra parameter is added to FileIsNewer() to have it check the INCLUDE paths also
// Interactive mode asks whether sources should be scanned for dependencies (#include, set procedure to, set proc to
@@ -7049,7 +7047,7 @@ FUNCTION GetLibs( lGcc, cDir )
LOCAL aLibsDesc := { { "Harbour hbmisc lib - hbmisc" + cExt , "hbmisc" + cExt },;
{ "Harbour NanFor Lib lib - hbnf" + cExt , "hbnf" + cExt },;
{ "Harbour GT Lib lib - hbgt"+cExt , "hbgt" + cExt },;
{ "Harbour ZipArch lib - hbziparch"+cExt , "hbziparch" + cExt + iif( lLinux, " stdc++.a z.a", " " ) },;
{ "Harbour ZipArchive lib - hbziparch"+cExt , "hbziparch" + cExt + iif( lLinux, " stdc++.a z.a", " " ) },;
{ "Harbour ole (old) lib - hbole"+ cExt , "hbole" + cExt + " ole2" + cExt },;
{ "Harbour MySQL lib - hbmysql" + cExt , "hbmysql" + cExt },;
{ "Harbour PostgreSQL lib - hbpgsql"+cExt , "hbpgsql" + cExt },;