diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b09d712b7c..435424a0f9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,22 @@ The license applies to all entries newer than 2009-04-28. */ +2010-08-03 21:57 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * include/hbextern.ch + * src/vm/Makefile + * src/vm/vmmt/Makefile + + src/vm/pvaluehb.c + + Added PVALUE() to Harbour core. + + * contrib/xhb/hbcompat.ch + * contrib/xhb/xhb.hbp + - contrib/xhb/xhbpval.c + * contrib/hbxpp/hbxpp.hbp + - contrib/hbxpp/pvalue.c + * contrib/hbfship/hbfship.hbp + - contrib/hbfship/pvalue.c + - Deleted PVALUE() definitions from contrib libs. + 2010-08-03 21:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/xhb/xhb.hbp + contrib/xhb/xhbpval.c diff --git a/harbour/contrib/hbfship/hbfship.hbp b/harbour/contrib/hbfship/hbfship.hbp index cd2fc7a916..f8893eb152 100644 --- a/harbour/contrib/hbfship/hbfship.hbp +++ b/harbour/contrib/hbfship/hbfship.hbp @@ -9,6 +9,5 @@ -w3 -es2 -pvalue.c secondfs.c strpeek.c diff --git a/harbour/contrib/hbxpp/hbxpp.hbp b/harbour/contrib/hbxpp/hbxpp.hbp index 8da2f6ff5f..432ff9aca0 100644 --- a/harbour/contrib/hbxpp/hbxpp.hbp +++ b/harbour/contrib/hbxpp/hbxpp.hbp @@ -23,7 +23,6 @@ idlex.c mousex.c oemansix.c philesx.c -pvalue.c wafuncx.c xppopc.c diff --git a/harbour/contrib/hbxpp/pvalue.c b/harbour/contrib/hbxpp/pvalue.c deleted file mode 100644 index 4127dbf5bb..0000000000 --- a/harbour/contrib/hbxpp/pvalue.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * PVALUE() function - * - * 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. - * - */ - -#include "hbapi.h" - -HB_FUNC_TRANSLATE( PVALUE, HB_PVALUE ) diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index 1436e6576e..80c586373a 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -87,7 +87,6 @@ #xtranslate hb_processClose([]) => hb_closeProcess() #xtranslate hb_isregex([]) => hb_isregexstring() - #xtranslate hb_pvalue([]) => pvalue() #xtranslate hb_methodName([]) => methodName() #xtranslate hb_libLoad([]) => libLoad() #xtranslate hb_libFree([]) => libFree() @@ -353,7 +352,6 @@ #xtranslate hb_closeProcess([]) => hb_processClose() #xtranslate hb_isregexstring([]) => hb_isregex() - #xtranslate pvalue([]) => hb_pvalue() #xtranslate methodName([]) => hb_methodName() #xtranslate libLoad([]) => hb_libLoad() #xtranslate libFree([]) => hb_libFree() diff --git a/harbour/contrib/xhb/xhb.hbp b/harbour/contrib/xhb/xhb.hbp index 5213905960..173b3a6b59 100644 --- a/harbour/contrib/xhb/xhb.hbp +++ b/harbour/contrib/xhb/xhb.hbp @@ -52,7 +52,6 @@ xhbmsgs.c xhbmtc.c xhbqself.c xhbproc.c -xhbpval.c xhbregx.c xhbsave.c xhbscr.c diff --git a/harbour/contrib/xhb/xhbpval.c b/harbour/contrib/xhb/xhbpval.c deleted file mode 100644 index 4127dbf5bb..0000000000 --- a/harbour/contrib/xhb/xhbpval.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * PVALUE() function - * - * 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. - * - */ - -#include "hbapi.h" - -HB_FUNC_TRANSLATE( PVALUE, HB_PVALUE ) diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index 1fcfae7bf1..e7ab17c98d 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -347,6 +347,7 @@ EXTERNAL ORDCOUNT EXTERNAL ORDWILDSEEK EXTERNAL MMIDDLEDOWN EXTERNAL STOD +EXTERNAL PVALUE #endif /* HiPer-SEEK / CFTS compatible functions */ diff --git a/harbour/src/vm/Makefile b/harbour/src/vm/Makefile index 2cb49733ad..b87a6cfd03 100644 --- a/harbour/src/vm/Makefile +++ b/harbour/src/vm/Makefile @@ -101,6 +101,7 @@ C_SOURCES += \ memvclip.c \ pcount.c \ pvalue.c \ + pvaluehb.c \ proc.c \ procaddr.c \ runner.c \ diff --git a/harbour/contrib/hbfship/pvalue.c b/harbour/src/vm/pvaluehb.c similarity index 81% rename from harbour/contrib/hbfship/pvalue.c rename to harbour/src/vm/pvaluehb.c index 4127dbf5bb..a2e1215018 100644 --- a/harbour/contrib/hbfship/pvalue.c +++ b/harbour/src/vm/pvaluehb.c @@ -52,4 +52,17 @@ #include "hbapi.h" +/* NOTE: This function is a new Harbour functions implemented in the + original CA-Cl*pper namespace. It should have been marked as + HB_EXTENSION, but it's not, because it's commonly used extension + in other xbase dialects, like Xbase++ and FlagShip. + Nevertheless this function must be kept in a separate + source file to avoid linking errors when a 3rd party + library or user code would also define this function. + [vszakats] */ + +#ifndef HB_CLP_STRICT + HB_FUNC_TRANSLATE( PVALUE, HB_PVALUE ) + +#endif diff --git a/harbour/src/vm/vmmt/Makefile b/harbour/src/vm/vmmt/Makefile index 1e31e77fb9..52d75c3b60 100644 --- a/harbour/src/vm/vmmt/Makefile +++ b/harbour/src/vm/vmmt/Makefile @@ -70,6 +70,7 @@ C_SOURCES += \ memvclip.c \ pcount.c \ pvalue.c \ + pvaluehb.c \ proc.c \ procaddr.c \ runner.c \