2008-11-04 17:28 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/source/vm/hvm.c
  * harbour/source/vm/mainstd.c
    * force linking main() function in OpenWatcom OS2 builds

  * harbour/contrib/xhb/hbcrypt.c
    ! casting
This commit is contained in:
Przemyslaw Czerpak
2008-11-04 16:27:40 +00:00
parent 6fd1776d74
commit da3a714803
4 changed files with 13 additions and 5 deletions

View File

@@ -8,6 +8,14 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-11-04 17:28 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/vm/hvm.c
* harbour/source/vm/mainstd.c
* force linking main() function in OpenWatcom OS2 builds
* harbour/contrib/xhb/hbcrypt.c
! casting
2008-11-04 13:06 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* include/hbextern.ch
* common.mak

View File

@@ -328,9 +328,9 @@ void nxs_xorcyclic(
ULONG crc1l, crc2l, crc3l;
/* Build the cyclic key seed */
crc1 = keylen >= 2 ? hb_adler32( 0, key + 0, keylen - 2 ) : 1;
crc2 = keylen >= 4 ? hb_adler32( 0, key + 2, keylen - 4 ) : 1;
crc3 = keylen >= 2 ? hb_adler32( 0, key + 1, keylen - 2 ) : 1;
crc1 = keylen >= 2 ? hb_adler32( 0, ( BYTE * ) key + 0, keylen - 2 ) : 1;
crc2 = keylen >= 4 ? hb_adler32( 0, ( BYTE * ) key + 2, keylen - 4 ) : 1;
crc3 = keylen >= 2 ? hb_adler32( 0, ( BYTE * ) key + 1, keylen - 2 ) : 1;
crc1l = crc1 = nxs_cyclic_sequence( crc1 );
crc2l = crc2 = nxs_cyclic_sequence( crc2 );

View File

@@ -10874,7 +10874,7 @@ HB_LANG_REQUEST( HB_LANG_DEFAULT )
# define HB_FORCE_LINK_MAIN hb_forceLinkMainWin
#elif defined(HB_OS_LINUX) && defined(__WATCOMC__)
#elif defined(__WATCOMC__) && ( defined(HB_OS_LINUX) || defined(HB_OS_OS2) )
# define HB_FORCE_LINK_MAIN hb_forceLinkMainStd

View File

@@ -77,7 +77,7 @@ char ** __crt0_glob_function( char * _arg )
}
#endif
#if defined(HB_OS_LINUX) && defined(__WATCOMC__)
#if defined(__WATCOMC__) && ( defined(HB_OS_LINUX) || defined(HB_OS_OS2) )
HB_EXPORT void hb_forceLinkMainStd( void ) {}
#endif