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

2009-12-16 09:59 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/common/hbdate.c
    * casting for some more pedantic C/C++ compilers

  * harbour/include/hbinit.h
    * allow to force static C++ initialization as startup code in
      GCC and SunPRO builds by HB_STATIC_STARTUP macro
This commit is contained in:
Przemyslaw Czerpak
2009-12-16 08:59:41 +00:00
parent 6f26003775
commit b258738f10
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-12-16 09:59 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/common/hbdate.c
* casting for some more pedantic C/C++ compilers
* harbour/include/hbinit.h
* allow to force static C++ initialization as startup code in
GCC and SunPRO builds by HB_STATIC_STARTUP macro
2009-12-16 04:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
! Fixed watcom targets to switch to single input file mode

3
harbour/include/hbinit.h
View File

@@ -147,7 +147,8 @@ extern HB_EXPORT PHB_SYMB hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbo
return ( void * ) func; \
}
#elif defined( __GNUC__ ) || defined( __SUNPRO_C ) || defined( __SUNPRO_CC )
#elif ( defined( __GNUC__ ) || defined( __SUNPRO_C ) || defined( __SUNPRO_CC ) ) && \
!defined( HB_STATIC_STARTUP )
#if defined( HB_PRAGMA_STARTUP ) || defined( HB_DATASEG_STARTUP )
#error Wrong macros set for startup code - clean your make/env settings.

2
harbour/src/common/hbdate.c
View File

@@ -925,7 +925,7 @@ long hb_timeUTCOffset( void ) /* in seconds */
timeinfo = *localtime( &current );
local = mktime( &timeinfo );
#endif
return difftime( local, utc ) + ( timeinfo.tm_isdst > 0 ? 3600 : 0 );
return ( long ) difftime( local, utc ) + ( timeinfo.tm_isdst > 0 ? 3600 : 0 );
}
#endif
}