From 43499ce1b5efd46a094d442df0704d25a105b668 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 17 Sep 2008 20:16:50 +0000 Subject: [PATCH] 2008-09-17 22:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/rddado/adordd.prg ! Marking one STATIC var as thread STATIC. ; BTW, this should be revised for whole contrib .prg code. --- harbour/ChangeLog | 5 +++++ harbour/contrib/rddado/adordd.prg | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3f2e1d946e..f3825ebeec 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-17 22:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/rddado/adordd.prg + ! Marking one STATIC var as thread STATIC. + ; BTW, this should be revised for whole contrib .prg code. + 2008-09-17 18:38 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbthread.h + added macros to disable default native compiler TLS support: diff --git a/harbour/contrib/rddado/adordd.prg b/harbour/contrib/rddado/adordd.prg index 5e8a6084d5..a7352f549c 100644 --- a/harbour/contrib/rddado/adordd.prg +++ b/harbour/contrib/rddado/adordd.prg @@ -83,11 +83,11 @@ #ifndef __XHARBOUR__ #include "hbusrrdd.ch" - #xcommand TRY => bError := errorBlock( {|oErr| break( oErr ) } ) ;; + #xcommand TRY => s_bError := errorBlock( {|oErr| break( oErr ) } ) ;; BEGIN SEQUENCE - #xcommand CATCH [] => errorBlock( bError ) ;; + #xcommand CATCH [] => errorBlock( s_bError ) ;; RECOVER [USING ] <-oErr-> ;; - errorBlock( bError ) + errorBlock( s_bError ) #command FINALLY => ALWAYS #else #include "usrrdd.ch" @@ -120,7 +120,11 @@ ANNOUNCE ADORDD -static bError, s_cTableName, s_cEngine, s_cServer, s_cUserName, s_cPassword, s_cQuery := "" +static s_cTableName, s_cEngine, s_cServer, s_cUserName, s_cPassword, s_cQuery := "" + +#ifndef __XHARBOUR__ +THREAD STATIC s_bError +#endif #ifdef __XHARBOUR__