From 12959545f876285914d44f4d3e2dfab6025251de Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 14 Apr 2007 12:32:53 +0000 Subject: [PATCH] 2007-04-14 14:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * harbour/include/hbcompat.ch ! Added copyright and CVS header. ! Indentation fixes. --- harbour/ChangeLog | 6 +- harbour/include/hbcompat.ch | 138 ++++++++++++++++++++++++------------ 2 files changed, 99 insertions(+), 45 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 35c382a083..2fb59134b2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-04-14 14:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * harbour/include/hbcompat.ch + ! Added copyright and CVS header. + ! Indentation fixes. + 2007-04-14 13:47 UTC+0200 Francesco Saverio Giudice (info/at/fsgiudice.com) * harbour/include/hbcompat.ch * added xharbour compatible hash translations @@ -88,7 +93,6 @@ I have built harbour as downloaded from CVS, no HB_COMPAT_XHB defined - 2007-04-14 12:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * harbour/include/hbstdgen.ch * harbour/include/box.ch diff --git a/harbour/include/hbcompat.ch b/harbour/include/hbcompat.ch index 8814cd5438..a0a250e806 100644 --- a/harbour/include/hbcompat.ch +++ b/harbour/include/hbcompat.ch @@ -1,30 +1,80 @@ -/*** hbcompat.ch ***/ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Header file for cross-compatibility between different Harbour flavours + * + * Copyright 1999-2007 {list of individual authors and e-mail addresses} + * 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. + * + */ #ifdef __HARBOUR__ #ifdef __XHARBOUR__ - #include "gtinfo.ch" - #include "gfx.ch" + #include "gtinfo.ch" + #include "gfx.ch" #else - #include "hbgtinfo.ch" - #include "hbgfx.ch" + #include "hbgtinfo.ch" + #include "hbgfx.ch" #endif #ifdef __XHARBOUR__ - #xtranslate hb_gtSys => gtSys - #xtranslate hb_gtInfo([]) => gtInfo([]) - #xtranslate hb_gtVersion([]) => hb_gt_Version([]) + #xtranslate hb_gtSys => gtSys + #xtranslate hb_gtInfo([]) => gtInfo([]) + #xtranslate hb_gtVersion([]) => hb_gt_Version([]) #else - #xtranslate gtSys => hb_gtSys - #xtranslate gtInfo([]) => hb_gtInfo([]) - #xtranslate hb_gt_Version([]) => hb_gtVersion([]) - #xtranslate gtSetClipboard() => hb_gtInfo( GTI_CLIPBOARDDATA, ) - #xtranslate gtGetClipboard() => hb_gtInfo( GTI_CLIPBOARDDATA ) - #xtranslate gtGetClipBoardSize() => len( hb_gtInfo( GTI_CLIPBOARDDATA ) ) - #xtranslate gtPasteClipBoard([]) => hb_gtInfo( GTI_CLIPBOARDPAST ) - #xtranslate gfxPrimitive([])=> hb_gfxPrimitive([]) - #xtranslate gfxText([]) => hb_gfxText([]) + #xtranslate gtSys => hb_gtSys + #xtranslate gtInfo([]) => hb_gtInfo([]) + #xtranslate hb_gt_Version([]) => hb_gtVersion([]) + #xtranslate gtSetClipboard() => hb_gtInfo( GTI_CLIPBOARDDATA, ) + #xtranslate gtGetClipboard() => hb_gtInfo( GTI_CLIPBOARDDATA ) + #xtranslate gtGetClipBoardSize() => len( hb_gtInfo( GTI_CLIPBOARDDATA ) ) + #xtranslate gtPasteClipBoard([]) => hb_gtInfo( GTI_CLIPBOARDPAST ) + #xtranslate gfxPrimitive([])=> hb_gfxPrimitive([]) + #xtranslate gfxText([]) => hb_gfxText([]) #endif #ifndef __XHARBOUR__ @@ -33,34 +83,34 @@ #if !defined( HB_COMPAT_XHB ) -#xtranslate HASH([]) => HB_HASH([]) -#xtranslate HHASKEY([]) => HB_HHASKEY([]) -#xtranslate HGETPOS([]) => HB_HPOS([]) -#xtranslate HGET([]) => HB_HGET([]) -#xtranslate HSET([]) => HB_HSET([]) -#xtranslate HDEL([]) => HB_HDEL([]) -#xtranslate HGETKEYAT([]) => HB_HKEYAT([]) -#xtranslate HGETVALUEAT([]) => HB_HVALUEAT([]) -#xtranslate HSETVALUEAT([]) => HB_HVALUEAT([]) -#xtranslate HGETPAIRAT([]) => HB_HPAIRAT([]) -#xtranslate HDELAT([]) => HB_HDELAT([]) -#xtranslate HGETKEYS([]) => HB_HKEYS([]) -#xtranslate HGETVALUES([]) => HB_HVALUES([]) -#xtranslate HFILL([]) => HB_HFILL([]) -#xtranslate HCLONE([]) => HB_HCLONE([]) -#xtranslate HCOPY([]) => HB_HCOPY([]) -#xtranslate HMERGE([]) => HB_HMERGE([]) -#xtranslate HEVAL([]) => HB_HEVAL([]) -#xtranslate HSCAN([]) => HB_HSCAN([]) -#xtranslate HSETCASEMATCH( , ) => HB_HCASEMATCH( , ); -#xtranslate HGETCASEMATCH([]) => HB_HCASEMATCH([]) -#xtranslate HSETAUTOADD( , ) => HB_HAUTOADD( , ); -#xtranslate HGETAUTOADD([]) => HB_HAUTOADD([]) -#xtranslate HALLOCATE([]) => HB_HALLOCATE([]) -#xtranslate HDEFAULT([]) => HB_HDEFAULT([]) + #xtranslate HASH([]) => HB_HASH([]) + #xtranslate HHASKEY([]) => HB_HHASKEY([]) + #xtranslate HGETPOS([]) => HB_HPOS([]) + #xtranslate HGET([]) => HB_HGET([]) + #xtranslate HSET([]) => HB_HSET([]) + #xtranslate HDEL([]) => HB_HDEL([]) + #xtranslate HGETKEYAT([]) => HB_HKEYAT([]) + #xtranslate HGETVALUEAT([]) => HB_HVALUEAT([]) + #xtranslate HSETVALUEAT([]) => HB_HVALUEAT([]) + #xtranslate HGETPAIRAT([]) => HB_HPAIRAT([]) + #xtranslate HDELAT([]) => HB_HDELAT([]) + #xtranslate HGETKEYS([]) => HB_HKEYS([]) + #xtranslate HGETVALUES([]) => HB_HVALUES([]) + #xtranslate HFILL([]) => HB_HFILL([]) + #xtranslate HCLONE([]) => HB_HCLONE([]) + #xtranslate HCOPY([]) => HB_HCOPY([]) + #xtranslate HMERGE([]) => HB_HMERGE([]) + #xtranslate HEVAL([]) => HB_HEVAL([]) + #xtranslate HSCAN([]) => HB_HSCAN([]) + #xtranslate HSETCASEMATCH( , ) => HB_HCASEMATCH( , ); + #xtranslate HGETCASEMATCH([]) => HB_HCASEMATCH([]) + #xtranslate HSETAUTOADD( , ) => HB_HAUTOADD( , ); + #xtranslate HGETAUTOADD([]) => HB_HAUTOADD([]) + #xtranslate HALLOCATE([]) => HB_HALLOCATE([]) + #xtranslate HDEFAULT([]) => HB_HDEFAULT([]) -#xtranslate NUMTOHEX() => NTOC(, 16) -#xtranslate HEXTONUM() => CTON(, 16) + #xtranslate NUMTOHEX() => NTOC(, 16) + #xtranslate HEXTONUM() => CTON(, 16) #endif