diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 79c80f18dc..ca9208cce6 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,16 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2012-12-11 17:41 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/pkg_dynl.hbm + * deleted no longer true reference to GNU Make + + * contrib/rddads/adsfunc.c + * contrib/rddads/rddads.hbx + + added AdsDDCreateRefIntegrity() and AdsDDRemoveRefIntegrity() + (former looks similar to xhb version, but incompatible due + to the several necessary fixes.) + 2012-12-09 14:52 UTC+0100 Viktor Szakats (harbour syenar.net) * tests/fixcase.hb ! minor fix diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c index 85efd7bbbb..d67d7a962a 100644 --- a/harbour/contrib/rddads/adsfunc.c +++ b/harbour/contrib/rddads/adsfunc.c @@ -1720,12 +1720,39 @@ HB_FUNC( ADSGETNUMACTIVELINKS ) /* Only valid for a DataDict */ hb_retni( pusNumLinks ); } -/* Please add all-version functions above this block */ +/* Please add all-version functions above this block */ + +HB_FUNC( ADSDDCREATEREFINTEGRITY ) +{ +#if ADS_LIB_VERSION >= 600 + hb_retl( AdsDDCreateRefIntegrity( HB_ADS_PARCONNECTION( 1 ) /* hDictionary */, + ( UNSIGNED8 * ) hb_parcx( 2 ) /* pucRIName */, + ( UNSIGNED8 * ) hb_parcx( 3 ) /* pucFailTable */, + ( UNSIGNED8 * ) hb_parcx( 4 ) /* pucParentTableName */, + ( UNSIGNED8 * ) hb_parcx( 5 ) /* pucParentTagName */, + ( UNSIGNED8 * ) hb_parcx( 6 ) /* pucChildTableName */, + ( UNSIGNED8 * ) hb_parcx( 7 ) /* pucChildTagName */, + ( UNSIGNED16 ) hb_parni( 8 ) /* usUpdateRule */, + ( UNSIGNED16 ) hb_parni( 9 ) /* usDeleteRule */ ) == AE_SUCCESS ); +#else + hb_retl( HB_FALSE ); +#endif +} + +HB_FUNC( ADSDDREMOVEREFINTEGRITY ) +{ +#if ADS_LIB_VERSION >= 600 + hb_retl( AdsDDRemoveRefIntegrity( HB_ADS_PARCONNECTION( 1 ) /* hDictionary */, + ( UNSIGNED8 * ) hb_parcx( 2 ) /* pucRIName */ ) == AE_SUCCESS ); +#else + hb_retl( HB_FALSE ); +#endif +} HB_FUNC( ADSDDADDTABLE ) { #if ADS_LIB_VERSION >= 600 - hb_retl( AdsDDAddTable( HB_ADS_PARCONNECTION( 4 ) /* hConnect */, + hb_retl( AdsDDAddTable( HB_ADS_PARCONNECTION( 4 ) /* hDictionary */, ( UNSIGNED8 * ) hb_parcx( 1 ) /* pTableName */, ( UNSIGNED8 * ) hb_parcx( 2 ) /* pTableFileName */, ( UNSIGNED16 ) hb_ads_iFileType, diff --git a/harbour/contrib/rddads/rddads.hbx b/harbour/contrib/rddads/rddads.hbx index c079c38acf..63df5d1ec2 100644 --- a/harbour/contrib/rddads/rddads.hbx +++ b/harbour/contrib/rddads/rddads.hbx @@ -54,6 +54,7 @@ DYNAMIC AdsDDAddTable DYNAMIC AdsDDAddUserToGroup DYNAMIC AdsDDCreate DYNAMIC AdsDDCreateLink +DYNAMIC AdsDDCreateRefIntegrity DYNAMIC AdsDDCreateUser DYNAMIC AdsDDDeleteUser DYNAMIC AdsDDDropLink @@ -61,6 +62,7 @@ DYNAMIC AdsDDGetDatabaseProperty DYNAMIC AdsDDGetUserProperty DYNAMIC AdsDDModifyLink DYNAMIC AdsDDRemoveIndexFile +DYNAMIC AdsDDRemoveRefIntegrity DYNAMIC AdsDDRemoveTable DYNAMIC AdsDDRemoveUserFromGroup DYNAMIC AdsDDSetDatabaseProperty diff --git a/harbour/utils/hbmk2/pkg_dynl.hbm b/harbour/utils/hbmk2/pkg_dynl.hbm index b364bbde45..661aa1c14a 100644 --- a/harbour/utils/hbmk2/pkg_dynl.hbm +++ b/harbour/utils/hbmk2/pkg_dynl.hbm @@ -33,5 +33,5 @@ {hbdyn&!unix&allwin}-o${hb_outputname}-${hb_major}${hb_minor}${hb_dynsuffix} {hbdyn&!unix&!allwin}-o${hb_outputname}${hb_dynsuffix} -# output dir (in sync with GNU Make) +# output dir {hbdyn}-obin/${hb_plat}/${hb_comp}${hb_build}/