From ce72edafe30b948b937bce17f441d36ce1e56082 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 26 Feb 2010 10:13:31 +0000 Subject: [PATCH] 2010-02-26 11:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbxpp/Makefile + contrib/hbxpp/thread.ch * contrib/hbxpp/tthreadx.prg + Added thread.ch compatibility header. ! Fixed QUIT_* constants to be the same as in real XPP, also moved them to header. --- harbour/ChangeLog | 8 ++++ harbour/contrib/hbxpp/Makefile | 1 + harbour/contrib/hbxpp/thread.ch | 59 ++++++++++++++++++++++++++++++ harbour/contrib/hbxpp/tthreadx.prg | 4 +- 4 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 harbour/contrib/hbxpp/thread.ch diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 403e478c14..dc45526c13 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-26 11:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbxpp/Makefile + + contrib/hbxpp/thread.ch + * contrib/hbxpp/tthreadx.prg + + Added thread.ch compatibility header. + ! Fixed QUIT_* constants to be the same as in real XPP, + also moved them to header. + 2010-02-26 11:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * harbour.spec + Added hbfoxpro, hbfship, hbxpp libs. diff --git a/harbour/contrib/hbxpp/Makefile b/harbour/contrib/hbxpp/Makefile index 8bbdab5930..2598348b83 100644 --- a/harbour/contrib/hbxpp/Makefile +++ b/harbour/contrib/hbxpp/Makefile @@ -42,6 +42,7 @@ PRG_HEADERS := \ dll.ch \ hbxpp.ch \ hbxppext.ch \ + thread.ch \ include $(TOP)$(ROOT)config/header.mk include $(TOP)$(ROOT)config/lib.mk diff --git a/harbour/contrib/hbxpp/thread.ch b/harbour/contrib/hbxpp/thread.ch new file mode 100644 index 0000000000..2ec023ea28 --- /dev/null +++ b/harbour/contrib/hbxpp/thread.ch @@ -0,0 +1,59 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Xbase++ compatibility header + * + * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) + * 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. + * + */ + +#ifndef _THREAD_CH +#define _THREAD_CH + +#define QUIT_NORESTART 0 +#define QUIT_RESTART 1 + +#endif diff --git a/harbour/contrib/hbxpp/tthreadx.prg b/harbour/contrib/hbxpp/tthreadx.prg index 4b06634a1c..39b45a311f 100644 --- a/harbour/contrib/hbxpp/tthreadx.prg +++ b/harbour/contrib/hbxpp/tthreadx.prg @@ -57,9 +57,7 @@ #include "hbclass.ch" #include "hbthread.ch" -/* I do not know Xbase++ values */ -#define QUIT_NORESTART 1 -#define QUIT_RESTART 2 +#include "thread.ch" /*