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

2010-06-20 19:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/vm/cmdarg.c
  * src/vm/fm.c
  * src/nortl/nortl.c
  * src/rtl/fmhb.c
  * include/hbapi.h
    + hb_xquery() return value changed from HB_ULONG to HB_SIZE.
      Also fixes all msvc64 warnings
This commit is contained in:
Viktor Szakats
2010-06-20 17:30:31 +00:00
parent 337219b053
commit 722c306052
6 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -16,6 +16,15 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-06-20 19:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/cmdarg.c
* src/vm/fm.c
* src/nortl/nortl.c
* src/rtl/fmhb.c
* include/hbapi.h
+ hb_xquery() return value changed from HB_ULONG to HB_SIZE.
Also fixes all msvc64 warnings
2010-06-20 19:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/macro.c
* src/vm/estack.c

2
harbour/include/hbapi.h
View File

@@ -491,7 +491,7 @@ extern HB_EXPORT void * hb_xgrab( HB_SIZE ulSize ) HB_MALLOC_ATTR HB_ALLOC_SIZ
extern HB_EXPORT void hb_xfree( void * pMem ); /* frees memory */
extern HB_EXPORT void * hb_xrealloc( void * pMem, HB_SIZE ulSize ) HB_ALLOC_SIZE_ATTR( 2 ); /* reallocates memory */
extern HB_EXPORT HB_SIZE hb_xsize( void * pMem ); /* returns the size of an allocated memory block */
extern HB_EXPORT HB_ULONG hb_xquery( int iMode ); /* Query different types of memory information */
extern HB_EXPORT HB_SIZE hb_xquery( int iMode ); /* Query different types of memory information */
extern HB_EXPORT HB_BOOL hb_xtraced( void );
extern HB_EXPORT void hb_xsetfilename( const char * szValue );
extern HB_EXPORT void hb_xsetinfo( const char * szValue );

4
harbour/src/nortl/nortl.c
View File

@@ -226,9 +226,9 @@ void hb_xfree( void * pMem ) /* frees fixed memory */
hb_errInternal( HB_EI_XFREENULL, "hb_xfree called with a NULL pointer", NULL, NULL );
}
HB_ULONG hb_xquery( int iMode )
HB_SIZE hb_xquery( int iMode )
{
HB_ULONG ulResult = 0;
HB_SIZE ulResult = 0;
#ifdef HB_FM_STATISTICS
switch( iMode )

2
harbour/src/rtl/fmhb.c
View File

@@ -54,5 +54,5 @@
HB_FUNC( MEMORY )
{
hb_retnint( hb_xquery( hb_parni( 1 ) ) );
hb_retns( hb_xquery( hb_parni( 1 ) ) );
}

4
harbour/src/vm/cmdarg.c
View File

@@ -507,9 +507,9 @@ HB_ULONG hb_cmdargProcessVM( int *pCancelKey, int *pCancelKeyEx )
{
char buffer[ 128 ];
#if defined( HB_CLP_STRICT )
hb_snprintf( buffer, sizeof( buffer ), "DS avail=%luKB OS avail=%luKB EMM avail=%luKB", hb_xquery( HB_MEM_BLOCK ), hb_xquery( HB_MEM_VM ), hb_xquery( HB_MEM_EMS ) );
hb_snprintf( buffer, sizeof( buffer ), "DS avail=%" HB_PFS "uKB OS avail=%" HB_PFS "uKB EMM avail=%" HB_PFS "uKB", hb_xquery( HB_MEM_BLOCK ), hb_xquery( HB_MEM_VM ), hb_xquery( HB_MEM_EMS ) );
#else
hb_snprintf( buffer, sizeof( buffer ), "DS avail=%luKB OS avail=%luKB EMM avail=%luKB MemStat:%s MT:%s", hb_xquery( HB_MEM_BLOCK ), hb_xquery( HB_MEM_VM ), hb_xquery( HB_MEM_EMS ), hb_xquery( HB_MEM_USEDMAX ) ? "On" : "Off", hb_vmIsMt() ? "On" : "Off" );
hb_snprintf( buffer, sizeof( buffer ), "DS avail=%" HB_PFS "uKB OS avail=%" HB_PFS "uKB EMM avail=%" HB_PFS "uKB MemStat:%s MT:%s", hb_xquery( HB_MEM_BLOCK ), hb_xquery( HB_MEM_VM ), hb_xquery( HB_MEM_EMS ), hb_xquery( HB_MEM_USEDMAX ) ? "On" : "Off", hb_vmIsMt() ? "On" : "Off" );
#endif
hb_conOutErr( buffer, 0 );
hb_conOutErr( hb_conNewLine(), 0 );

4
harbour/src/vm/fm.c
View File

@@ -1206,9 +1206,9 @@ void hb_xexit( void ) /* Deinitialize fixed memory subsystem */
#endif
HB_ULONG hb_xquery( int iMode )
HB_SIZE hb_xquery( int iMode )
{
HB_ULONG ulResult;
HB_SIZE ulResult;
HB_TRACE(HB_TR_DEBUG, ("hb_xquery(%d)", iMode));