From 29d0452381ef7a09a11dae5c31c90eba6eeb31f6 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 27 Nov 2010 20:09:34 +0000 Subject: [PATCH] 2010-11-27 21:09 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/rddbmcdx/rddbmcdx.hbp * contrib/rddbmcdx/bmdbfcdx.c + contrib/rddbmcdx/bmdbfnsx.c + contrib/rddbmcdx/bmdbfntx.c + Added BMDBFNTX and BMDBFNSX variants. --- harbour/ChangeLog | 7 ++++ harbour/contrib/rddbmcdx/bmdbfcdx.c | 43 +++++++++++++++++---- harbour/contrib/rddbmcdx/bmdbfnsx.c | 55 +++++++++++++++++++++++++++ harbour/contrib/rddbmcdx/bmdbfntx.c | 55 +++++++++++++++++++++++++++ harbour/contrib/rddbmcdx/rddbmcdx.hbp | 2 + 5 files changed, 154 insertions(+), 8 deletions(-) create mode 100644 harbour/contrib/rddbmcdx/bmdbfnsx.c create mode 100644 harbour/contrib/rddbmcdx/bmdbfntx.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e2b587cdd1..2287d05eb8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-27 21:09 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/rddbmcdx/rddbmcdx.hbp + * contrib/rddbmcdx/bmdbfcdx.c + + contrib/rddbmcdx/bmdbfnsx.c + + contrib/rddbmcdx/bmdbfntx.c + + Added BMDBFNTX and BMDBFNSX variants. + 2010-11-27 20:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk ! HB_INSTALL_PREFIX now defaults to /opt/harbour (instead of /usr/local) diff --git a/harbour/contrib/rddbmcdx/bmdbfcdx.c b/harbour/contrib/rddbmcdx/bmdbfcdx.c index b1530030d7..53fa37e447 100644 --- a/harbour/contrib/rddbmcdx/bmdbfcdx.c +++ b/harbour/contrib/rddbmcdx/bmdbfcdx.c @@ -725,9 +725,18 @@ static const RDDFUNCS bmTable = ( DBENTRYP_SVP ) NULL /* WhoCares */ }; -HB_FUNC_EXTERN( DBFCDX ); HB_FUNC( BMDBFCDX ) { HB_FUNC_EXEC( DBFCDX ); } +#if defined( HB_BMDBFNSX ) + #define _HB_PARENT_RDD "DBFNSX" + HB_FUNC_EXTERN( DBFNSX ); HB_FUNC( BMDBFNSX ) { HB_FUNC_EXEC( DBFNSX ); } +#elif defined( HB_BMDBFNTX ) + #define _HB_PARENT_RDD "DBFNTX" + HB_FUNC_EXTERN( DBFNTX ); HB_FUNC( BMDBFNTX ) { HB_FUNC_EXEC( DBFNTX ); } +#else + #define _HB_PARENT_RDD "DBFCDX" + HB_FUNC_EXTERN( DBFCDX ); HB_FUNC( BMDBFCDX ) { HB_FUNC_EXEC( DBFCDX ); } +#endif -HB_FUNC_STATIC( BMDBFCDX_GETFUNCTABLE ) +HB_FUNC_STATIC( _GETFUNCTABLE ) { RDDFUNCS * pTable, * pSuperTable; HB_USHORT * puiCount, uiRddId, * puiSuperRddId; @@ -738,7 +747,7 @@ HB_FUNC_STATIC( BMDBFCDX_GETFUNCTABLE ) uiRddId = ( HB_USHORT ) hb_parni( 4 ); puiSuperRddId = ( HB_USHORT * ) hb_parptr( 5 ); - HB_TRACE(HB_TR_DEBUG, ("BMDBFCDX_GETFUNCTABLE(%p, %p, %p, %hu, %p)", puiCount, pTable, pSuperTable, uiRddId, puiSuperRddId)); + HB_TRACE(HB_TR_DEBUG, ("BM" _HB_PARENT_RDD "_GETFUNCTABLE(%p, %p, %p, %hu, %p)", puiCount, pTable, pSuperTable, uiRddId, puiSuperRddId)); if( pTable ) { @@ -749,7 +758,7 @@ HB_FUNC_STATIC( BMDBFCDX_GETFUNCTABLE ) if( !pSuperTable ) pSuperTable = &bmSuper; - errCode = hb_rddInheritEx( pTable, &bmTable, pSuperTable, "DBFCDX", puiSuperRddId ); + errCode = hb_rddInheritEx( pTable, &bmTable, pSuperTable, _HB_PARENT_RDD, puiSuperRddId ); hb_retni( errCode ); if( errCode == HB_SUCCESS ) { @@ -770,16 +779,34 @@ static void hb_bmRddInit( void * cargo ) { HB_SYMBOL_UNUSED( cargo ); - if( hb_rddRegister( "DBFCDX", RDT_FULL ) > 1 || - hb_rddRegister( "BMDBFCDX", RDT_FULL ) > 1 ) + if( hb_rddRegister( _HB_PARENT_RDD, RDT_FULL ) > 1 || + hb_rddRegister( "BM" _HB_PARENT_RDD, RDT_FULL ) > 1 ) hb_errInternal( HB_EI_RDDINVALID, NULL, NULL, NULL ); } +#if defined( HB_BMDBFNSX ) + HB_INIT_SYMBOLS_BEGIN( bmap1__InitSymbols ) -{ "BMDBFCDX", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( BMDBFCDX )}, NULL }, -{ "BMDBFCDX_GETFUNCTABLE", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( BMDBFCDX_GETFUNCTABLE )}, NULL } +{ "BM" _HB_PARENT_RDD, {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( BMDBFNSX )}, NULL }, +{ "BM" _HB_PARENT_RDD "_GETFUNCTABLE", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( _GETFUNCTABLE )}, NULL } HB_INIT_SYMBOLS_END( bmap1__InitSymbols ) +#elif defined( HB_BMDBFNTX ) + +HB_INIT_SYMBOLS_BEGIN( bmap1__InitSymbols ) +{ "BM" _HB_PARENT_RDD, {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( BMDBFNTX )}, NULL }, +{ "BM" _HB_PARENT_RDD "_GETFUNCTABLE", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( _GETFUNCTABLE )}, NULL } +HB_INIT_SYMBOLS_END( bmap1__InitSymbols ) + +#else + +HB_INIT_SYMBOLS_BEGIN( bmap1__InitSymbols ) +{ "BM" _HB_PARENT_RDD, {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( BMDBFCDX )}, NULL }, +{ "BM" _HB_PARENT_RDD "_GETFUNCTABLE", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( _GETFUNCTABLE )}, NULL } +HB_INIT_SYMBOLS_END( bmap1__InitSymbols ) + +#endif + HB_CALL_ON_STARTUP_BEGIN( _hb_bm_rdd_init_ ) hb_vmAtInit( hb_bmRddInit, NULL ); HB_CALL_ON_STARTUP_END( _hb_bm_rdd_init_ ) diff --git a/harbour/contrib/rddbmcdx/bmdbfnsx.c b/harbour/contrib/rddbmcdx/bmdbfnsx.c new file mode 100644 index 0000000000..27431d2ec4 --- /dev/null +++ b/harbour/contrib/rddbmcdx/bmdbfnsx.c @@ -0,0 +1,55 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * BMRDDNSX wrapper + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#define HB_BMDBFNSX + +#include "bmdbfcdx.c" diff --git a/harbour/contrib/rddbmcdx/bmdbfntx.c b/harbour/contrib/rddbmcdx/bmdbfntx.c new file mode 100644 index 0000000000..8a3070a17a --- /dev/null +++ b/harbour/contrib/rddbmcdx/bmdbfntx.c @@ -0,0 +1,55 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * BMRDDNTX wrapper + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#define HB_BMDBFNTX + +#include "bmdbfcdx.c" diff --git a/harbour/contrib/rddbmcdx/rddbmcdx.hbp b/harbour/contrib/rddbmcdx/rddbmcdx.hbp index 519fea6c89..14a826ad41 100644 --- a/harbour/contrib/rddbmcdx/rddbmcdx.hbp +++ b/harbour/contrib/rddbmcdx/rddbmcdx.hbp @@ -10,3 +10,5 @@ -w3 -es2 bmdbfcdx.c +bmdbfnsx.c +bmdbfntx.c