From cc606c3e9a22259333d2b5aeb0f95c58bccbda0d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 23 Jun 2011 07:50:50 +0000 Subject: [PATCH] 2011-06-23 09:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/vm/classes.c ! error if HB_USE_PROFILER is defined. Patch from Teo Fonrouge. --- harbour/ChangeLog | 4 ++++ harbour/src/vm/classes.c | 1 + 2 files changed, 5 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 48883cf430..c7c36f898e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2011-06-23 09:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/vm/classes.c + ! error if HB_USE_PROFILER is defined. Patch from Teo Fonrouge. + 2011-06-21 16:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg * -vcshead= option made more robust by eliminating redirection diff --git a/harbour/src/vm/classes.c b/harbour/src/vm/classes.c index db00c892dc..a872ab00dc 100644 --- a/harbour/src/vm/classes.c +++ b/harbour/src/vm/classes.c @@ -4844,6 +4844,7 @@ HB_FUNC_STATIC( msgNull ) #ifndef HB_NO_PROFILER void hb_mthAddTime( HB_ULONG ulClockTicks ) { + HB_STACK_TLS_PRELOAD PHB_ITEM pObject = hb_stackSelfItem(); PCLASS pClass = s_pClasses[ hb_objGetClassH( pObject ) ]; HB_USHORT uiMethod = hb_stackBaseItem()->item.asSymbol.stackstate->uiMethod;