From addea6d04ec0471f9f657c54ac9c33764f779f54 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 22 May 2008 06:09:35 +0000 Subject: [PATCH] 2008-05-22 08:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) - contrib/hbmisc/dbftools.c * contrib/hbmisc/common.mak * contrib/hbmisc/Makefile - Removed to avoid collision with similar file in hbct. Notice the content was also similar, except that in hbct it was updated and extended. There was also FIELDTYPE() implemented which was colliding with function with the same name in core. * include/hbextern.ch * source/rdd/dbcmd.c * source/rdd/dbdrop.c * source/rdd/dbexists.c * source/rdd/fieldhb.c + Added HB_ prefixed versions of DBDROP(), DBEXISTS(), FIELDDEC(), FIELDLEN(), FIELDTYPE() * source/rdd/rddinfo.c ! Comment. * tests/multifnc/Makefile ! Updated lib names. * contrib/hbapollo/apollo.c ! Fixed MSVC errors. * contrib/mtpl_b32.bat * contrib/mtpl_vc.bat ! Removed one obsolete line. + Now defines _HB_MAKELOG. * contrib/hbapollo/make_b32.bat * contrib/hbapollo/make_vc.bat * contrib/hbfimage/make_b32.bat * contrib/hbgd/make_b32.bat * contrib/hbhpdf/make_b32.bat * contrib/hbmysql/make_b32.bat * contrib/hbodbc/make_b32.bat * contrib/hbodbc/make_vc.bat * contrib/hbpgsql/make_b32.bat * contrib/hbpgsql/make_vc.bat * contrib/hbw32ddr/make_b32.bat * contrib/hbw32ddr/make_vc.bat * contrib/hbzlib/make_b32.bat * contrib/rddads/make_b32.bat + Redirects .lib creation (implib, lib) output to log file. * contrib/xhb/hbcompat.ch + Added some more converions for xhb code. * contrib/rddads/ads1.c + Added two TODOs. (to adsDrop and adsExists) * source/pp/hbppgen.c ! MSVC warning fixed. * make_vc.mak ! Typo in prev commit. --- harbour/ChangeLog | 60 ++++++++++++++ harbour/contrib/hbapollo/apollo.c | 50 +++++------ harbour/contrib/hbapollo/make_b32.bat | 2 +- harbour/contrib/hbapollo/make_vc.bat | 2 +- harbour/contrib/hbfimage/make_b32.bat | 2 +- harbour/contrib/hbgd/make_b32.bat | 2 +- harbour/contrib/hbhpdf/make_b32.bat | 2 +- harbour/contrib/hbmisc/Makefile | 1 - harbour/contrib/hbmisc/common.mak | 1 - harbour/contrib/hbmisc/dbftools.c | 110 ------------------------- harbour/contrib/hbmysql/make_b32.bat | 2 +- harbour/contrib/hbodbc/make_b32.bat | 2 +- harbour/contrib/hbodbc/make_vc.bat | 2 +- harbour/contrib/hbpgsql/make_b32.bat | 2 +- harbour/contrib/hbpgsql/make_vc.bat | 2 +- harbour/contrib/hbw32ddr/make_b32.bat | 2 +- harbour/contrib/hbw32ddr/make_vc.bat | 2 +- harbour/contrib/hbzlib/make_b32.bat | 2 +- harbour/contrib/mtpl_b32.bat | 10 +-- harbour/contrib/mtpl_vc.bat | 10 +-- harbour/contrib/rddads/ads1.c | 6 ++ harbour/contrib/rddads/make_b32.bat | 2 +- harbour/contrib/xhb/hbcompat.ch | 8 ++ harbour/include/hbextern.ch | 11 ++- harbour/make_vc.mak | 3 +- harbour/source/pp/hbppgen.c | 2 +- harbour/source/rdd/dbcmd.c | 114 ++++++++++++++++++++++++++ harbour/source/rdd/dbdrop.c | 22 +---- harbour/source/rdd/dbexists.c | 22 +---- harbour/source/rdd/fieldhb.c | 70 ++-------------- harbour/source/rdd/rddinfo.c | 3 +- harbour/tests/multifnc/Makefile | 22 ++--- 32 files changed, 276 insertions(+), 277 deletions(-) delete mode 100644 harbour/contrib/hbmisc/dbftools.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1838985704..6036c11a69 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,66 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-05-22 08:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + - contrib/hbmisc/dbftools.c + * contrib/hbmisc/common.mak + * contrib/hbmisc/Makefile + - Removed to avoid collision with similar file in hbct. + Notice the content was also similar, except that + in hbct it was updated and extended. There was also + FIELDTYPE() implemented which was colliding with + function with the same name in core. + + * include/hbextern.ch + * source/rdd/dbcmd.c + * source/rdd/dbdrop.c + * source/rdd/dbexists.c + * source/rdd/fieldhb.c + + Added HB_ prefixed versions of DBDROP(), + DBEXISTS(), FIELDDEC(), FIELDLEN(), FIELDTYPE() + + * source/rdd/rddinfo.c + ! Comment. + + * tests/multifnc/Makefile + ! Updated lib names. + + * contrib/hbapollo/apollo.c + ! Fixed MSVC errors. + + * contrib/mtpl_b32.bat + * contrib/mtpl_vc.bat + ! Removed one obsolete line. + + Now defines _HB_MAKELOG. + + * contrib/hbapollo/make_b32.bat + * contrib/hbapollo/make_vc.bat + * contrib/hbfimage/make_b32.bat + * contrib/hbgd/make_b32.bat + * contrib/hbhpdf/make_b32.bat + * contrib/hbmysql/make_b32.bat + * contrib/hbodbc/make_b32.bat + * contrib/hbodbc/make_vc.bat + * contrib/hbpgsql/make_b32.bat + * contrib/hbpgsql/make_vc.bat + * contrib/hbw32ddr/make_b32.bat + * contrib/hbw32ddr/make_vc.bat + * contrib/hbzlib/make_b32.bat + * contrib/rddads/make_b32.bat + + Redirects .lib creation (implib, lib) output to log file. + + * contrib/xhb/hbcompat.ch + + Added some more converions for xhb code. + + * contrib/rddads/ads1.c + + Added two TODOs. (to adsDrop and adsExists) + + * source/pp/hbppgen.c + ! MSVC warning fixed. + + * make_vc.mak + ! Typo in prev commit. + 2008-05-21 19:30 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/rdd/dbdrop.c * source/rdd/dbexists.c diff --git a/harbour/contrib/hbapollo/apollo.c b/harbour/contrib/hbapollo/apollo.c index 3dabdb1f01..46ee84b8b8 100644 --- a/harbour/contrib/hbapollo/apollo.c +++ b/harbour/contrib/hbapollo/apollo.c @@ -103,8 +103,8 @@ HB_FUNC( SX_CREATEEXEC ) * --------------------------------------------------*/ HB_FUNC( SX_CREATEFIELD ) { - sx_CreateField( hb_parc( 1 ), /* Field name */ - hb_parc( 2 ), /* Field type */ + sx_CreateField( ( PBYTE ) hb_parc( 1 ), /* Field name */ + ( PBYTE ) hb_parc( 2 ), /* Field type */ hb_parni( 3 ), /* Field lenght */ hb_parni( 4 ) ); /* Field decimals */ } @@ -117,8 +117,8 @@ HB_FUNC( SX_CREATEFIELD ) HB_FUNC( SX_CREATENEW ) { hb_retni( - sx_CreateNew( hb_parc( 1 ), /* Field name */ - hb_parc( 2 ), /* Alias */ + sx_CreateNew( ( PBYTE ) hb_parc( 1 ), /* Field name */ + ( PBYTE ) hb_parc( 2 ), /* Alias */ hb_parni( 3 ), /* RDE Type */ hb_parni( 4 ) ) ); /* The maximum number of fields to be added to the file structure */ } @@ -142,7 +142,7 @@ HB_FUNC( SX_EOF ) HB_FUNC( SX_GETDATEJULIAN ) { hb_retni( - sx_GetDateJulian( hb_parc( 1 ) ) ); /* Field name */ + sx_GetDateJulian( ( PBYTE ) hb_parc( 1 ) ) ); /* Field name */ } @@ -153,7 +153,7 @@ HB_FUNC( SX_GETDATEJULIAN ) HB_FUNC( SX_GETLOGICAL ) { hb_retl( - sx_GetLogical( hb_parc( 1 ) ) ); /* Field name */ + sx_GetLogical( ( PBYTE ) hb_parc( 1 ) ) ); /* Field name */ } @@ -163,7 +163,7 @@ HB_FUNC( SX_GETLOGICAL ) HB_FUNC( SX_GETSTRING ) { hb_retc( - ( char * )sx_GetString( hb_parc( 1 ) ) ); /* Field name */ + ( char * )sx_GetString( ( PBYTE ) hb_parc( 1 ) ) ); /* Field name */ } @@ -173,7 +173,7 @@ HB_FUNC( SX_GETSTRING ) HB_FUNC( SX_GETVARIANT ) { hb_retc( - ( char * )sx_GetVariant( hb_parc( 1 ) ) ); /* Field name */ + ( char * )sx_GetVariant( ( PBYTE ) hb_parc( 1 ) ) ); /* Field name */ } @@ -210,12 +210,12 @@ HB_FUNC( SX_GOTOP ) HB_FUNC( SX_INDEXTAG ) { hb_retni( - sx_IndexTag( hb_parc( 1 ), /* Field name */ - hb_parc( 2 ), /* Tag name */ - hb_parc( 3 ), /* Index expression as a string */ - hb_parni( 4 ), /* Option (0=Standard) (1=Unique) (2=Roll-Your-Own) */ - hb_parl( 5 ), /* True for a descend index */ - hb_parc( 6) ) ); /* Condition */ + sx_IndexTag( ( PBYTE ) hb_parc( 1 ), /* Field name */ + ( PBYTE ) hb_parc( 2 ), /* Tag name */ + ( PBYTE ) hb_parc( 3 ), /* Index expression as a string */ + hb_parni( 4 ), /* Option (0=Standard) (1=Unique) (2=Roll-Your-Own) */ + hb_parl( 5 ), /* True for a descend index */ + ( PBYTE ) hb_parc( 6) ) ); /* Condition */ } @@ -257,13 +257,13 @@ HB_FUNC( SX_REPLACE ) switch ( hb_parni( 2 ) ) { case R_INTEGER : - case R_JULIAN : sx_Replace( hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parni( 3) ) ; break; - case R_LOGICAL : sx_Replace( hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parni( 3) ) ; break; /* TODO: somthing is wrong here... */ - case R_LONG : sx_Replace( hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parnl( 3) ) ; break; + case R_JULIAN : sx_Replace( ( PBYTE ) hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parni( 3) ) ; break; + case R_LOGICAL : sx_Replace( ( PBYTE ) hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parni( 3) ) ; break; /* TODO: somthing is wrong here... */ + case R_LONG : sx_Replace( ( PBYTE ) hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parnl( 3) ) ; break; case R_DOUBLE : { double d = hb_parnd( 3 ); - sx_Replace( hb_parc( 1 ), hb_parni( 2 ), ( void * ) &d ); + sx_Replace( ( PBYTE ) hb_parc( 1 ), hb_parni( 2 ), ( void * ) &d ); break; } case R_CHAR : @@ -271,8 +271,8 @@ switch ( hb_parni( 2 ) ) case R_MEMO : case R_BITMAP : case R_BLOBFILE: - case R_BLOBPTR : sx_Replace( hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parc( 3) ) ; break; - default: sx_Replace( hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parc( 3) ); + case R_BLOBPTR : sx_Replace( ( PBYTE ) hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parc( 3) ) ; break; + default: sx_Replace( ( PBYTE ) hb_parc( 1 ), hb_parni( 2 ), ( void * ) hb_parc( 3) ); } } @@ -293,7 +293,7 @@ HB_FUNC( SX_RLOCK ) HB_FUNC( SX_SEEK ) { hb_retl( - sx_Seek( hb_parc( 1 ) ) ); /* The value to search for as a string */ + sx_Seek( ( PBYTE ) hb_parc( 1 ) ) ); /* The value to search for as a string */ } @@ -304,7 +304,7 @@ HB_FUNC( SX_SEEK ) HB_FUNC( SX_SELECT ) { hb_retni( - sx_Seek( hb_parc( 1 ) ) ); /* The work area number returned when the file was opened. */ + sx_Seek( ( PBYTE ) hb_parc( 1 ) ) ); /* The work area number returned when the file was opened. */ } @@ -397,8 +397,8 @@ HB_FUNC( SX_DISABLEAUTOOPEN ) HB_FUNC( SX_USE ) { hb_retni( - sx_Use( hb_parc( 1 ), /* Filename */ - hb_parc( 2 ), /* Alias */ + sx_Use( ( PBYTE ) hb_parc( 1 ), /* Filename */ + ( PBYTE ) hb_parc( 2 ), /* Alias */ hb_parni( 3 ), /* OpenMode */ hb_parni( 4) )); /* RDE Type */ } @@ -457,4 +457,4 @@ sx_SysProp sx_Use() sx_Version() sx_Zap() -*/ \ No newline at end of file +*/ diff --git a/harbour/contrib/hbapollo/make_b32.bat b/harbour/contrib/hbapollo/make_b32.bat index da54caf701..4195c1d261 100644 --- a/harbour/contrib/hbapollo/make_b32.bat +++ b/harbour/contrib/hbapollo/make_b32.bat @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbapollo/make_vc.bat b/harbour/contrib/hbapollo/make_vc.bat index 9fdfaec657..8793da7670 100644 --- a/harbour/contrib/hbapollo/make_vc.bat +++ b/harbour/contrib/hbapollo/make_vc.bat @@ -50,7 +50,7 @@ if "%1" == "INSTALL" goto POST_INSTALL echo.LIBRARY "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" > _temp.def echo.EXPORTS >> _temp.def sed -nf _temp.sed < _dump.tmp >> _temp.def - LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib + LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib >> %_HB_MAKELOG% del _dump.tmp del _temp.def del _temp.sed diff --git a/harbour/contrib/hbfimage/make_b32.bat b/harbour/contrib/hbfimage/make_b32.bat index 2c67b9d090..1f0058fcef 100644 --- a/harbour/contrib/hbfimage/make_b32.bat +++ b/harbour/contrib/hbfimage/make_b32.bat @@ -39,7 +39,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbgd/make_b32.bat b/harbour/contrib/hbgd/make_b32.bat index 12a28dca20..089ae777fd 100644 --- a/harbour/contrib/hbgd/make_b32.bat +++ b/harbour/contrib/hbgd/make_b32.bat @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbhpdf/make_b32.bat b/harbour/contrib/hbhpdf/make_b32.bat index 6867858488..bb119ba0b5 100644 --- a/harbour/contrib/hbhpdf/make_b32.bat +++ b/harbour/contrib/hbhpdf/make_b32.bat @@ -39,7 +39,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbmisc/Makefile b/harbour/contrib/hbmisc/Makefile index 7472a30209..4a5ee12d6c 100644 --- a/harbour/contrib/hbmisc/Makefile +++ b/harbour/contrib/hbmisc/Makefile @@ -6,7 +6,6 @@ ROOT = ../../ C_SOURCES=\ dates2.c \ - dbftools.c \ hb_f.c \ mathx.c \ strfmt.c \ diff --git a/harbour/contrib/hbmisc/common.mak b/harbour/contrib/hbmisc/common.mak index 6846270fbe..e62214e419 100644 --- a/harbour/contrib/hbmisc/common.mak +++ b/harbour/contrib/hbmisc/common.mak @@ -8,7 +8,6 @@ LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT) LIB_OBJS = \ $(OBJ_DIR)dates2$(OBJEXT) \ - $(OBJ_DIR)dbftools$(OBJEXT) \ $(OBJ_DIR)hb_f$(OBJEXT) \ $(OBJ_DIR)mathx$(OBJEXT) \ $(OBJ_DIR)strfmt$(OBJEXT) \ diff --git a/harbour/contrib/hbmisc/dbftools.c b/harbour/contrib/hbmisc/dbftools.c deleted file mode 100644 index 1e09740f61..0000000000 --- a/harbour/contrib/hbmisc/dbftools.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * Some dbf structure related functions - * - * Copyright 2000 Alexander Kresin - * www - http://www.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. - * - */ - -#include "hbapi.h" -#include "hbapirdd.h" - -HB_FUNC( FIELDTYPE ) -{ - USHORT uiField; - LPFIELD pField; - AREAP pArea; - - uiField = hb_parni( 1 ); - pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); - pField = pArea->lpFields + uiField - 1; - - switch( pField->uiType ) - { - case HB_IT_STRING: - hb_retc( "C" ); - break; - case HB_IT_LONG: - hb_retc( "N" ); - break; - case HB_IT_DATE: - hb_retc( "D" ); - break; - case HB_IT_LOGICAL: - hb_retc( "L" ); - break; - case HB_IT_MEMO: - hb_retc( "M" ); - break; - } -} - -HB_FUNC( FIELDSIZE ) -{ - USHORT uiField; - LPFIELD pField; - AREAP pArea; - - uiField = hb_parni( 1 ); - pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); - pField = pArea->lpFields + uiField - 1; - - hb_retni( pField->uiLen ); -} - -HB_FUNC( FIELDDECI ) -{ - USHORT uiField; - LPFIELD pField; - AREAP pArea; - - uiField = hb_parni( 1 ); - pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); - pField = pArea->lpFields + uiField - 1; - - hb_retni( pField->uiDec ); -} diff --git a/harbour/contrib/hbmysql/make_b32.bat b/harbour/contrib/hbmysql/make_b32.bat index 98b5286350..541cb679ce 100644 --- a/harbour/contrib/hbmysql/make_b32.bat +++ b/harbour/contrib/hbmysql/make_b32.bat @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbodbc/make_b32.bat b/harbour/contrib/hbodbc/make_b32.bat index 32c232e549..9bc1404975 100644 --- a/harbour/contrib/hbodbc/make_b32.bat +++ b/harbour/contrib/hbodbc/make_b32.bat @@ -26,7 +26,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbodbc/make_vc.bat b/harbour/contrib/hbodbc/make_vc.bat index 4a4452615f..33269a1618 100644 --- a/harbour/contrib/hbodbc/make_vc.bat +++ b/harbour/contrib/hbodbc/make_vc.bat @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL echo.LIBRARY "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" > _temp.def echo.EXPORTS >> _temp.def sed -nf _temp.sed < _dump.tmp >> _temp.def - LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib + LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib >> %_HB_MAKELOG% del _dump.tmp del _temp.def del _temp.sed diff --git a/harbour/contrib/hbpgsql/make_b32.bat b/harbour/contrib/hbpgsql/make_b32.bat index dd9662b212..2315bd88e1 100644 --- a/harbour/contrib/hbpgsql/make_b32.bat +++ b/harbour/contrib/hbpgsql/make_b32.bat @@ -39,7 +39,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.exe" + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.exe" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbpgsql/make_vc.bat b/harbour/contrib/hbpgsql/make_vc.bat index 7bceb5a80b..82b12cd196 100644 --- a/harbour/contrib/hbpgsql/make_vc.bat +++ b/harbour/contrib/hbpgsql/make_vc.bat @@ -51,7 +51,7 @@ if "%1" == "INSTALL" goto POST_INSTALL echo.LIBRARY "%HB_DLL_DIR%\%HB_DLL_NAME%.exe" > _temp.def echo.EXPORTS >> _temp.def sed -nf _temp.sed < _dump.tmp >> _temp.def - LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib + LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib >> %_HB_MAKELOG% del _dump.tmp del _temp.def del _temp.sed diff --git a/harbour/contrib/hbw32ddr/make_b32.bat b/harbour/contrib/hbw32ddr/make_b32.bat index 38b93a03a7..1c1f36ef56 100644 --- a/harbour/contrib/hbw32ddr/make_b32.bat +++ b/harbour/contrib/hbw32ddr/make_b32.bat @@ -32,7 +32,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/hbw32ddr/make_vc.bat b/harbour/contrib/hbw32ddr/make_vc.bat index 23781b23b6..162c7a58f5 100644 --- a/harbour/contrib/hbw32ddr/make_vc.bat +++ b/harbour/contrib/hbw32ddr/make_vc.bat @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL echo.LIBRARY "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" > _temp.def echo.EXPORTS >> _temp.def sed -nf _temp.sed < _dump.tmp >> _temp.def - LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib + LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib >> %_HB_MAKELOG% del _dump.tmp del _temp.def del _temp.sed diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat index 597c9fac68..1f8c1ae4c5 100644 --- a/harbour/contrib/hbzlib/make_b32.bat +++ b/harbour/contrib/hbzlib/make_b32.bat @@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib -a ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" + implib -a ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/mtpl_b32.bat b/harbour/contrib/mtpl_b32.bat index c4e9bab436..bf32fa32b0 100644 --- a/harbour/contrib/mtpl_b32.bat +++ b/harbour/contrib/mtpl_b32.bat @@ -23,6 +23,7 @@ if "%_HB_CC_NAME%" == "" set _HB_CC_NAME=b32 if "%_HB_MAKE_PROGRAM%" == "" set _HB_MAKE_PROGRAM=make.exe if "%_HB_MAKEFILE%" == "" set _HB_MAKEFILE=..\mtpl_%_HB_CC_NAME%.mak +set _HB_MAKELOG=make_%_HB_CC_NAME%.log set HB_EXIT_LEVEL= rem --------------------------------------------------------------- @@ -36,19 +37,18 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 - if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log + if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad %_HB_MAKELOG% goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT - if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul - if exist inst_%_HB_CC_NAME%.log del inst_%_HB_CC_NAME%.log > nul + if exist %_HB_MAKELOG% del %_HB_MAKELOG% > nul goto EXIT :INSTALL diff --git a/harbour/contrib/mtpl_vc.bat b/harbour/contrib/mtpl_vc.bat index d04400cb79..fcaf62c268 100644 --- a/harbour/contrib/mtpl_vc.bat +++ b/harbour/contrib/mtpl_vc.bat @@ -23,6 +23,7 @@ if "%_HB_CC_NAME%" == "" set _HB_CC_NAME=vc if "%_HB_MAKE_PROGRAM%" == "" set _HB_MAKE_PROGRAM=nmake.exe if "%_HB_MAKEFILE%" == "" set _HB_MAKEFILE=..\mtpl_%_HB_CC_NAME%.mak +set _HB_MAKELOG=make_%_HB_CC_NAME%.log set HB_EXIT_LEVEL= rem --------------------------------------------------------------- @@ -36,19 +37,18 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 - if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log + if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad %_HB_MAKELOG% goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT - if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul - if exist inst_%_HB_CC_NAME%.log del inst_%_HB_CC_NAME%.log > nul + if exist %_HB_MAKELOG% del %_HB_MAKELOG% > nul goto EXIT :INSTALL diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 0f4b2e2939..04b4ad375c 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -4584,6 +4584,7 @@ static ERRCODE adsPutValueFile( ADSAREAP pArea, USHORT uiIndex, BYTE * szFile, U #define adsWriteDBHeader NULL +/* TODO: Use AdsDeleteFile() */ static ERRCODE adsDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex ) { char szFileName[ _POSIX_PATH_MAX + 1 ], * szFile, * szExt; @@ -4666,6 +4667,11 @@ static ERRCODE adsDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex return fResult ? SUCCESS : FAILURE; } +/* TODO: Use AdsCheckExistence() + UNSIGNED32 ENTRYPOINT AdsCheckExistence( ADSHANDLE hConnect, + UNSIGNED8 *pucFileName, + UNSIGNED16 *pusOnDisk ); +*/ static ERRCODE adsExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex ) { char szFileName[ _POSIX_PATH_MAX + 1 ], * szFile; diff --git a/harbour/contrib/rddads/make_b32.bat b/harbour/contrib/rddads/make_b32.bat index 37f0ded365..85361ca6f1 100644 --- a/harbour/contrib/rddads/make_b32.bat +++ b/harbour/contrib/rddads/make_b32.bat @@ -42,7 +42,7 @@ if "%1" == "INSTALL" goto POST_INSTALL :POST_BUILD - implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" + implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib "%HB_DLL_DIR%\%HB_DLL_NAME%.dll" >> %_HB_MAKELOG% goto POST_EXIT :POST_CLEAN diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index 22ca715f80..7f48769a6f 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -66,6 +66,14 @@ #xtranslate MaxRow(.T.) => hb_gtInfo( HB_GTI_SCREENHEIGHT ) #xtranslate MaxCol(.T.) => hb_gtInfo( HB_GTI_SCREENWIDTH ) + #xtranslate hb_dbPack() => __dbPack() + #xtranslate hb_dbZap() => __dbZap() + #xtranslate hb_dbDrop([]) => dbDrop() + #xtranslate hb_dbExists([]) => dbExists() + #xtranslate hb_FieldLen([]) => FieldLen() + #xtranslate hb_FieldDec([]) => FieldDec() + #xtranslate hb_FieldType([]) => FieldType() + #xtranslate hb_isregex([]) => hb_isregexstring() #xtranslate hb_pvalue([]) => pvalue() #xtranslate hb_methodName([])=> methodName() diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index 6ea763599e..17ac999f85 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -331,9 +331,9 @@ EXTERNAL YEAR /* Harbour extensions violating extension namespace rules (but not marked as HB_EXTENSION). */ +EXTERNAL RDDINFO EXTERNAL DBDROP EXTERNAL DBEXISTS -EXTERNAL RDDINFO EXTERNAL FIELDLEN EXTERNAL FIELDDEC EXTERNAL FIELDTYPE @@ -854,8 +854,6 @@ EXTERNAL HB_HEXTOSTR EXTERNAL HB_STRTOHEX EXTERNAL HB_ISPRINTER EXTERNAL HB_GETENV -EXTERNAL HB_RDDGETTEMPALIAS -EXTERNAL HB_RDDINFO EXTERNAL HB_USERNAME EXTERNAL HB_INISETCOMMENT @@ -902,8 +900,15 @@ EXTERNAL HB_GETSTDERR EXTERNAL HB_GETSTDIN EXTERNAL HB_GETSTDOUT +EXTERNAL HB_RDDGETTEMPALIAS +EXTERNAL HB_RDDINFO EXTERNAL HB_DBPACK EXTERNAL HB_DBZAP +EXTERNAL HB_DBDROP +EXTERNAL HB_DBEXISTS +EXTERNAL HB_FIELDLEN +EXTERNAL HB_FIELDDEC +EXTERNAL HB_FIELDTYPE EXTERNAL HB_SCRMAXROW EXTERNAL HB_SCRMAXCOL diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak index d06a5a6ee9..9294c72506 100644 --- a/harbour/make_vc.mak +++ b/harbour/make_vc.mak @@ -877,7 +877,8 @@ $(LDFLAGS) /OUT:$(HBDOC_EXE) $(**: = ^ ) -$(STANDARD_STATIC_HBLIBS $(HBDOC_LIBS) +$(STANDARD_STATIC_HBLIBS) +$(HBDOC_LIBS) user32.lib winspool.lib <<$(KEEPSTATE) #********************************************************** diff --git a/harbour/source/pp/hbppgen.c b/harbour/source/pp/hbppgen.c index da306dcb6d..b7f4a552ae 100644 --- a/harbour/source/pp/hbppgen.c +++ b/harbour/source/pp/hbppgen.c @@ -477,7 +477,7 @@ static int hb_pp_parseChangelog( PHB_PP_STATE pState, const char * pszFileName, if( szFrom ) { hb_pp_addDefine( pState, "HB_VER_SVNID", szFrom ); - *piSVNID = hb_strValInt( szFrom, &iLen ); + *piSVNID = ( int ) hb_strValInt( szFrom, &iLen ); } else { diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index 2213d7f94e..04182ecb6e 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -2033,3 +2033,117 @@ HB_FUNC( HB_RDDINFO ) hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "RDDINFO" ); } } + +HB_FUNC( HB_DBDROP ) +{ + LPRDDNODE pRDDNode; + USHORT uiRddID; + const char * szDriver; + + szDriver = hb_parc( 3 ); + if( !szDriver ) /* no VIA RDD parameter, use default */ + { + szDriver = hb_rddDefaultDrv( NULL ); + } + + pRDDNode = hb_rddFindNode( szDriver, &uiRddID ); /* find the RDDNODE */ + + if( pRDDNode ) + hb_retl( SELF_DROP( pRDDNode, hb_param( 1, HB_IT_STRING ), + hb_param( 2, HB_IT_STRING ) ) == SUCCESS ); + else + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "HB_DBDROP" ); +} + +HB_FUNC( HB_DBEXISTS ) +{ + LPRDDNODE pRDDNode; + USHORT uiRddID; + const char * szDriver; + + szDriver = hb_parc( 3 ); + if( !szDriver ) /* no VIA RDD parameter, use default */ + { + szDriver = hb_rddDefaultDrv( NULL ); + } + + pRDDNode = hb_rddFindNode( szDriver, &uiRddID ); /* find the RDD */ + + if( pRDDNode ) + hb_retl( SELF_EXISTS( pRDDNode, hb_param( 1, HB_IT_STRING ), + hb_param( 2, HB_IT_STRING ) ) == SUCCESS ); + else + hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "HB_DBEXISTS" ); +} + +HB_FUNC( HB_FIELDLEN ) +{ + AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); + + if( pArea ) + { + USHORT uiIndex; + + if( ( uiIndex = hb_parni( 1 ) ) > 0 ) + { + PHB_ITEM pItem = hb_itemNew( NULL ); + + if( SELF_FIELDINFO( pArea, uiIndex, DBS_LEN, pItem ) == SUCCESS ) + { + hb_itemReturnRelease( pItem ); + return; + } + hb_itemRelease( pItem ); + } + } + + hb_retni( 0 ); +} + +HB_FUNC( HB_FIELDDEC ) +{ + AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); + + if( pArea ) + { + USHORT uiIndex; + + if( ( uiIndex = hb_parni( 1 ) ) > 0 ) + { + PHB_ITEM pItem = hb_itemNew( NULL ); + + if( SELF_FIELDINFO( pArea, uiIndex, DBS_DEC, pItem ) == SUCCESS ) + { + hb_itemReturnRelease( pItem ); + return; + } + hb_itemRelease( pItem ); + } + } + + hb_retni( 0 ); +} + +HB_FUNC( HB_FIELDTYPE ) +{ + AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); + + if( pArea ) + { + USHORT uiIndex; + + if( ( uiIndex = hb_parni( 1 ) ) > 0 ) + { + PHB_ITEM pItem = hb_itemNew( NULL ); + + if( SELF_FIELDINFO( pArea, uiIndex, DBS_TYPE, pItem ) == SUCCESS ) + { + hb_itemReturnRelease( pItem ); + return; + } + hb_itemRelease( pItem ); + } + } + + hb_retc( NULL ); +} diff --git a/harbour/source/rdd/dbdrop.c b/harbour/source/rdd/dbdrop.c index 127e95b5b9..b5a6f610e5 100644 --- a/harbour/source/rdd/dbdrop.c +++ b/harbour/source/rdd/dbdrop.c @@ -52,30 +52,14 @@ */ #include "hbapi.h" -#include "hbapirdd.h" -#include "hbapierr.h" /* NOTE: This function is a new Harbour function implemented in the original CA-Cl*pper namespace. This should have been marked as HB_EXTENSION, but it's not. */ +HB_FUNC_EXTERN( HB_DBDROP ); + HB_FUNC( DBDROP ) { - LPRDDNODE pRDDNode; - USHORT uiRddID; - const char * szDriver; - - szDriver = hb_parc( 3 ); - if( !szDriver ) /* no VIA RDD parameter, use default */ - { - szDriver = hb_rddDefaultDrv( NULL ); - } - - pRDDNode = hb_rddFindNode( szDriver, &uiRddID ); /* find the RDDNODE */ - - if( pRDDNode ) - hb_retl( SELF_DROP( pRDDNode, hb_param( 1, HB_IT_STRING ), - hb_param( 2, HB_IT_STRING ) ) == SUCCESS ); - else - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "DBDROP" ); + HB_FUNC_EXEC( HB_DBDROP ); } diff --git a/harbour/source/rdd/dbexists.c b/harbour/source/rdd/dbexists.c index fa21f7200b..b2d0d7b070 100644 --- a/harbour/source/rdd/dbexists.c +++ b/harbour/source/rdd/dbexists.c @@ -52,30 +52,14 @@ */ #include "hbapi.h" -#include "hbapirdd.h" -#include "hbapierr.h" /* NOTE: This function is a new Harbour function implemented in the original CA-Cl*pper namespace. This should have been marked as HB_EXTENSION, but it's not. */ +HB_FUNC_EXTERN( HB_DBEXISTS ); + HB_FUNC( DBEXISTS ) { - LPRDDNODE pRDDNode; - USHORT uiRddID; - const char * szDriver; - - szDriver = hb_parc( 3 ); - if( !szDriver ) /* no VIA RDD parameter, use default */ - { - szDriver = hb_rddDefaultDrv( NULL ); - } - - pRDDNode = hb_rddFindNode( szDriver, &uiRddID ); /* find the RDD */ - - if( pRDDNode ) - hb_retl( SELF_EXISTS( pRDDNode, hb_param( 1, HB_IT_STRING ), - hb_param( 2, HB_IT_STRING ) ) == SUCCESS ); - else - hb_errRT_DBCMD( EG_ARG, EDBCMD_EVAL_BADPARAMETER, NULL, "DBEXISTS" ); + HB_FUNC_EXEC( HB_DBEXISTS ); } diff --git a/harbour/source/rdd/fieldhb.c b/harbour/source/rdd/fieldhb.c index 51dd0c4ad8..0472472c71 100644 --- a/harbour/source/rdd/fieldhb.c +++ b/harbour/source/rdd/fieldhb.c @@ -52,80 +52,28 @@ */ #include "hbapi.h" -#include "hbapirdd.h" -#include "hbapiitm.h" /* NOTE: These functions are a new Harbour functions implemented in the original CA-Cl*pper namespace. These should have been marked as HB_EXTENSION, but they're not. */ +HB_FUNC_EXTERN( HB_FIELDLEN ); + HB_FUNC( FIELDLEN ) { - AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); - - if( pArea ) - { - USHORT uiIndex; - if( ( uiIndex = hb_parni( 1 ) ) > 0 ) - { - PHB_ITEM pItem = hb_itemNew( NULL ); - - if( SELF_FIELDINFO( pArea, uiIndex, DBS_LEN, pItem ) == SUCCESS ) - { - hb_itemReturnRelease( pItem ); - return; - } - hb_itemRelease( pItem ); - } - } - - hb_retni(0); + HB_FUNC_EXEC( HB_FIELDLEN ); } +HB_FUNC_EXTERN( HB_FIELDDEC ); + HB_FUNC( FIELDDEC ) { - AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); - - if( pArea ) - { - USHORT uiIndex; - - if( ( uiIndex = hb_parni( 1 ) ) > 0 ) - { - PHB_ITEM pItem = hb_itemNew( NULL ); - - if( SELF_FIELDINFO( pArea, uiIndex, DBS_DEC, pItem ) == SUCCESS ) - { - hb_itemReturnRelease( pItem ); - return; - } - hb_itemRelease( pItem ); - } - } - - hb_retni(0); + HB_FUNC_EXEC( HB_FIELDDEC ); } +HB_FUNC_EXTERN( HB_FIELDTYPE ); + HB_FUNC( FIELDTYPE ) { - AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); - - if( pArea ) - { - USHORT uiIndex; - - if( ( uiIndex = hb_parni( 1 ) ) > 0 ) - { - PHB_ITEM pItem = hb_itemNew( NULL ); - - if( SELF_FIELDINFO( pArea, uiIndex, DBS_TYPE, pItem ) == SUCCESS ) - { - hb_itemReturnRelease( pItem ); - return; - } - hb_itemRelease( pItem ); - } - } - - hb_retc( NULL ); + HB_FUNC_EXEC( HB_FIELDTYPE ); } diff --git a/harbour/source/rdd/rddinfo.c b/harbour/source/rdd/rddinfo.c index 672303dc89..efe6af6a9d 100644 --- a/harbour/source/rdd/rddinfo.c +++ b/harbour/source/rdd/rddinfo.c @@ -56,7 +56,8 @@ HB_FUNC_EXTERN( HB_RDDINFO ); /* NOTE: This function is a new Harbour function implemented in the - original CA-Cl*pper namespace. */ + original CA-Cl*pper namespace. This should have been + marked as HB_EXTENSION, but it's not. */ HB_FUNC( RDDINFO ) { diff --git a/harbour/tests/multifnc/Makefile b/harbour/tests/multifnc/Makefile index d5c5aaab5a..4191ffb901 100644 --- a/harbour/tests/multifnc/Makefile +++ b/harbour/tests/multifnc/Makefile @@ -40,16 +40,16 @@ PRG_SOURCES=\ PRG_MAIN=t0.prg LIBS=\ - debug \ - vm \ - rtl \ - lang \ - codepage \ - rdd \ - rtl \ - vm \ - macro \ - pp \ - common \ + hbdebug \ + hbvm \ + hbrtl \ + hblang \ + hbcpage \ + hbrdd \ + hbrtl \ + hbvm \ + hbmacro \ + hbpp \ + hbcommon \ include $(TOP)$(ROOT)config/bin.cf