2011-01-30 15:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbwin/hbolesrv.c
    ! Fixed doubly defined symbols in HB_BUILD_CONTRIB_DYN=yes.
      'hbmaindllp.lib(dllpcode.obj) : error LNK2005: _DllMain@12 already defined in hbolesrv.obj'
      OLE server code will be left out of the .dll version of hbwin lib, 
      please refine it if needed.
This commit is contained in:
Viktor Szakats
2011-01-30 14:52:42 +00:00
parent fd56026109
commit a1dbda51ad
2 changed files with 11 additions and 0 deletions

View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-01-30 15:51 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/hbolesrv.c
! Fixed doubly defined symbols in HB_BUILD_CONTRIB_DYN=yes.
'hbmaindllp.lib(dllpcode.obj) : error LNK2005: _DllMain@12 already defined in hbolesrv.obj'
OLE server code will be left out of the .dll version of hbwin lib,
please refine it if needed.
2011-01-30 15:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/listbox.prg
! LISTBOX(): Fixed RTE (and 5.3 incompatibility) when

View File

@@ -50,6 +50,8 @@
*
*/
#if ! defined( HB_DYNLIB )
#include "hbapi.h"
#include "hbwinole.h"
@@ -914,3 +916,5 @@ HB_FUNC( WIN_OLESERVERINIT )
else
hb_retl( s_fServerReady );
}
#endif