From b5c8dee6c3d0020a50689a6c33f344c68ef34a18 Mon Sep 17 00:00:00 2001 From: Ignacio Ortiz de Zuniga Date: Fri, 31 Aug 2001 10:14:58 +0000 Subject: [PATCH] 2001-08-31 12:15 GMT+1 Ignacio Ortiz --- harbour/ChangeLog | 7 +++++ harbour/include/clipdefs.h | 59 ++++++++++++++++++++++++-------------- harbour/include/extend.api | 49 +++++++++++++++++++++---------- harbour/tests/testget.prg | 11 ++++--- 4 files changed, 84 insertions(+), 42 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 87f338c544..f09ac0e5ee 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,10 @@ +2001-08-31 12:15 GMT+1 Ignacio Ortiz + * source/bin/bld.bat + * source/include/extend.api + * source/include/clipdefs.h + * source/tests/testget.prg + * Return to previous revision due a mistake in last CVS process + 2001-08-31 11:32 GMT+1 Antonio Linares + harbour/source/vm/mainlgtk.c Added Marek Paliwoda's Linux GTK application entry point diff --git a/harbour/include/clipdefs.h b/harbour/include/clipdefs.h index 91c5655ac1..f92fdb2d0d 100644 --- a/harbour/include/clipdefs.h +++ b/harbour/include/clipdefs.h @@ -6,20 +6,13 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper base definitions * - * Copyright 1999 Victor Szakats + * Copyright 1999-2001 Viktor Szakats * 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 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) 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 HRL - * and/or HVM code into it. + * 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 @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * 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. * */ @@ -61,9 +78,9 @@ typedef SHORTP PSHORT; typedef USHORT * USHORTP; typedef USHORTP PUSHORT; -// typedef unsigned int WORD; -// typedef WORD * WORDP; -// typedef WORDP PWORD; +typedef unsigned int WORD; +typedef WORD * WORDP; +typedef WORDP PWORD; typedef LONG * LONGP; typedef LONGP PLONG; @@ -81,11 +98,11 @@ typedef BOOLP PBOOL; typedef void * NEARP; typedef NEARP * NEARPP; -// typedef void * FARP; -// typedef FARP * FARPP; +typedef void * FARP; +typedef FARP * FARPP; -// typedef FARP VOIDP; -// typedef FARP PVOID; +typedef FARP VOIDP; +typedef FARP PVOID; typedef void * HANDLE; typedef ERRCODE IHELP; @@ -105,4 +122,4 @@ typedef FUNCP * FUNCPP; #define NULL 0 #endif -#endif /* _CLIPDEFS_H */ \ No newline at end of file +#endif /* _CLIPDEFS_H */ diff --git a/harbour/include/extend.api b/harbour/include/extend.api index e823f819a2..3d8cf6b530 100644 --- a/harbour/include/extend.api +++ b/harbour/include/extend.api @@ -6,20 +6,13 @@ * Harbour Project source code: * Compatibility header file for CA-Clipper Extend API * - * Copyright 1999 Victor Szakats + * Copyright 1999-2001 Viktor Szakats * 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 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) 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 HRL - * and/or HVM code into it. + * 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 @@ -27,9 +20,33 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). + * 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. * */ @@ -52,13 +69,13 @@ typedef PHB_ITEM ITEM; #define CHARACTER HB_IT_STRING #define NUMERIC HB_IT_NUMERIC #define LOGICAL HB_IT_LOGICAL -//#define DATE HB_IT_DATE +#define DATE HB_IT_DATE #define ALIAS HB_IT_ALIAS #define MPTR HB_IT_BYREF /* or'ed with type when passed by reference */ #define MEMO HB_IT_MEMO /* NOTE: CA-Cl*pper bug: WORD will conflict with the typedef with the same name in clipdefs.h [vszakats] */ -//#define WORD ( HB_IT_INTEGER | HB_IT_LONG ) +#define WORD ( HB_IT_INTEGER | HB_IT_LONG ) #define ARRAY HB_IT_ARRAY #define BLOCK HB_IT_BLOCK #define DOUBLE HB_IT_DOUBLE @@ -99,3 +116,5 @@ typedef PHB_ITEM ITEM; #define _stornl hb_stornl #endif /* _EXTEND_API */ + + diff --git a/harbour/tests/testget.prg b/harbour/tests/testget.prg index efd6f837d0..39384dd756 100644 --- a/harbour/tests/testget.prg +++ b/harbour/tests/testget.prg @@ -1,18 +1,16 @@ Procedure Main() - LOCAL GetList := {}, cVar := "Hello", nVal := 100 + LOCAL GetList := {}, cVar := "Hello" MEMVAR aVar, nIndex, cMacro PRIVATE aVar := { "World", "Again" }, nIndex := 1, cMacro := "cEarly", cEarly := {"Early"}, cLate := "Late!", cEarly2 := {"Early2"} CLS - ? "Aqui falla: " + Transform("100", "@Z") ? "2nd GET should say 'Early'." @ 10,10 SAY "cVar :" GET cVar PICTURE "@K!" - @ 12,10 SAY "Prueba :" GET nVal PICTURE "@z 999" - //@ 12,10 SAY "cMacro[1] :" GET &cMacro[1] - //@ 14,10 SAY "cMacro.2[1] :" GET &cMacro.2[1] + @ 12,10 SAY "cMacro[1] :" GET &cMacro[1] + @ 14,10 SAY "cMacro.2[1] :" GET &cMacro.2[1] @ 16,10 SAY "cEarly[1] :" GET cEarly[1] //@ 14,10 SAY "cMacro :" GET &(cMacro)[1] nIndex := 2 @@ -32,4 +30,5 @@ Procedure Main() READ */ -RETURN \ No newline at end of file +RETURN +