fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-08-30 10:29 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/pp/Makefile
  * harbour/source/main/Makefile
    ! hacked the order of linked library list to resolve problem with
      potential cross references between libraries on platforms which do
      not support library grouping

  * harbour/source/nortl/nortl.c
    ! added missing include hbmemory.ch

  * harbour/source/compiler/hbmain.c
    ! added protection against multiple init function freeing
This commit is contained in:
Przemyslaw Czerpak
2009-08-30 08:29:20 +00:00
parent d362316d9a
commit 389141c531
5 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -17,6 +17,19 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-30 10:29 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/pp/Makefile
* harbour/source/main/Makefile
! hacked the order of linked library list to resolve problem with
potential cross references between libraries on platforms which do
not support library grouping
* harbour/source/nortl/nortl.c
! added missing include hbmemory.ch
* harbour/source/compiler/hbmain.c
! added protection against multiple init function freeing
2009-08-30 08:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
+ Added sqlite3 and allegro package names for Ubuntu.

14
harbour/source/compiler/hbmain.c
View File

@@ -3875,6 +3875,13 @@ void hb_compCompileEnd( HB_COMP_DECL )
}
HB_COMP_PARAM->functions.pLast = NULL;
if( HB_COMP_PARAM->pInitFunc &&
( HB_COMP_PARAM->pInitFunc->funFlags & FUN_ATTACHED ) == 0 )
{
hb_compFunctionKill( HB_COMP_PARAM, HB_COMP_PARAM->pInitFunc );
}
HB_COMP_PARAM->pInitFunc = NULL;
if( HB_COMP_PARAM->functions.pFirst )
{
PFUNCTION pFunc = HB_COMP_PARAM->functions.pFirst;
@@ -3884,13 +3891,6 @@ void hb_compCompileEnd( HB_COMP_DECL )
HB_COMP_PARAM->functions.pFirst = NULL;
}
if( HB_COMP_PARAM->pInitFunc &&
( HB_COMP_PARAM->pInitFunc->funFlags & FUN_ATTACHED ) == 0 )
{
hb_compFunctionKill( HB_COMP_PARAM, HB_COMP_PARAM->pInitFunc );
HB_COMP_PARAM->pInitFunc = NULL;
}
while( HB_COMP_PARAM->funcalls.pFirst )
{
PFUNCALL pFunc = HB_COMP_PARAM->funcalls.pFirst;

2
harbour/source/main/Makefile
View File

@@ -11,7 +11,7 @@ C_MAIN := harbour.c
LIBS := \
hbcplr \
hbpp \
hbcommon \
hbnortl \
hbcommon \
include $(TOP)$(ROOT)config/bin.mk

1
harbour/source/nortl/nortl.c
View File

@@ -56,6 +56,7 @@
#include "hbset.h"
#include "hbvm.h"
#include "hbcomp.h"
#include "hbmemory.ch"
/* ------------------------------------------------------------------------- */
/* FM statistic module */

2
harbour/source/pp/Makefile
View File

@@ -14,8 +14,8 @@ C_SOURCES := \
LIBNAME := hbpp
LIBS := \
hbcommon \
hbnortl \
hbcommon \
include $(TOP)$(ROOT)config/lib.mk