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

2024-03-07 13:41 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* contrib/gtqtc/gtqtc.hbp
    ! do not detect QT5 when HB_BUILD_3RDEXT=no is set

  * debian/rules
    * removed LD_LIBRARY_PATH setting

  * src/rdd/dbcmd.c
  * src/rdd/wacore.c
    ! moved code checking WA number from DbSelectArea() PRG function
      to hb_rddSelectWorkAreaNumber() C function. It fixes few things
      like:
         DbSelectArea( 0 )
      and also:
         ? ( 0 )->( select() )
This commit is contained in:
Przemysław Czerpak
2024-03-07 13:41:15 +01:00
parent 050666d2d9
commit a5ad762cb0
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog.txt
View File

@@ -7,6 +7,22 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */
2024-03-07 13:41 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/gtqtc/gtqtc.hbp
! do not detect QT5 when HB_BUILD_3RDEXT=no is set
* debian/rules
* removed LD_LIBRARY_PATH setting
* src/rdd/dbcmd.c
* src/rdd/wacore.c
! moved code checking WA number from DbSelectArea() PRG function
to hb_rddSelectWorkAreaNumber() C function. It fixes few things
like:
DbSelectArea( 0 )
and also:
? ( 0 )->( select() )
2024-02-16 18:23 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbexpat/3rd/expat/expat.diff
* contrib/hbexpat/3rd/expat/loadlibr.c

1
contrib/gtqtc/gtqtc.hbp
View File

@@ -24,6 +24,7 @@
-deppkgname=qt5:qt5
-depkeyhead=qt5:QtCore/QJsonObject
-depcontrol=qt5:${HB_WITH_QT}
{HB_BUILD_3RDEXT='no'}-depoptional=qt5:no
-depoptional=qt5:yes
-depincpath=qt5:/usr/include/x86_64-linux-gnu/qt5{linux}
-depincpath=qt5:/usr/local/opt/qt5/include{darwin}

6
debian/rules vendored
View File

@@ -20,12 +20,6 @@ export HB_INSTALL_MAN := $(HB_INSTALL_PKG_ROOT)/usr/share/man
export HB_INSTALL_ETC := $(HB_INSTALL_PKG_ROOT)/etc/harbour
export HB_INSTALL_CONTRIB := $(HB_INSTALL_PKG_ROOT)/usr/share/harbour/contrib
ifeq ($(LD_LIBRARY_PATH),)
export LD_LIBRARY_PATH := $(HB_INSTALL_DYN)
else
export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(HB_INSTALL_DYN)
endif
export HB_SYSLOC := yes
export HB_BUILD_PKG := no
export HB_BUILD_SHARED := yes

12
src/rdd/dbcmd.c
View File

@@ -747,21 +747,9 @@ HB_FUNC( DBSELECTAREA )
iNewArea = ( int ) hb_dynsymAreaHandle( pSymAlias->pDynSym );
}
}
/*
* NOTE: iNewArea >= HB_RDD_MAX_AREA_NUM used intentionally
* In Clipper area 65535 is reserved for "M" alias [druzus]
*/
if( iNewArea < 1 || iNewArea >= HB_RDD_MAX_AREA_NUM )
{
if( hb_rddSelectFirstAvailable() != HB_SUCCESS )
hb_rddSelectWorkAreaNumber( 0 );
}
else
{
hb_rddSelectWorkAreaNumber( iNewArea );
}
}
}
HB_FUNC( __DBSETFOUND )
{

7
src/rdd/wacore.c
View File

@@ -500,10 +500,11 @@ HB_ERRCODE hb_rddSelectWorkAreaNumber( int iArea )
HB_TRACE( HB_TR_DEBUG, ( "hb_rddSelectWorkAreaNumber(%d)", iArea ) );
pRddInfo = hb_stackRDD();
if( iArea < 1 || iArea > HB_RDD_MAX_AREA_NUM )
HB_SET_WA( 0 );
else
if( iArea >= 1 && iArea <= HB_RDD_MAX_AREA_NUM )
HB_SET_WA( ( HB_AREANO ) iArea );
else if( hb_rddSelectFirstAvailable() != HB_SUCCESS )
HB_SET_WA( 0 );
return ( pRddInfo->pCurrArea == NULL ) ? HB_FAILURE : HB_SUCCESS;
}