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

2009-08-17 14:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* source/vm/itemapi.c
  * source/vm/extend.c
  * source/rtl/fserr.c
  * source/rtl/gtsln/keytrans.c
    * #ifdef -> #if defined()
This commit is contained in:
Viktor Szakats
2009-08-17 12:13:52 +00:00
parent c9d3a93d9b
commit 6e4311bae9
5 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-08-17 14:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/vm/itemapi.c
* source/vm/extend.c
* source/rtl/fserr.c
* source/rtl/gtsln/keytrans.c
* #ifdef -> #if defined()
2009-08-17 16:02 UTC+0300 Phil Krylov <phil@newstar.rinet.ru>
* source/debug/tbrwtext.prg
! Fixed RTE on deleting the last tracepoint.

2
harbour/source/rtl/fserr.c
View File

@@ -241,7 +241,7 @@ void hb_fsSetIOError( BOOL fResult, USHORT uiOperation )
uiOsErrorLast = ( USHORT ) GetLastError();
uiErrorLast = ( USHORT ) hb_WinToDosError( uiOsErrorLast );
#elif defined( _MSC_VER ) || defined( __DMC__ )
#ifdef __XCC__
#if defined( __XCC__ )
extern unsigned long _doserrno;
extern void __cdecl _dosmaperr( unsigned long oserrno );
_dosmaperr( GetLastError() );

2
harbour/source/rtl/gtsln/keytrans.c
View File

@@ -148,7 +148,7 @@ static int KeyTranslationTable[][ 2 ] =
#endif
#if HB_GT_KBD_MODIF_MASK
#ifdef __linux__
#if defined( __linux__ )
{ SL_KEY_ALT( 'A' ) | ( ALTL_PRESSED << 16 ), K_ALT_A },
{ SL_KEY_ALT( 'B' ) | ( ALTL_PRESSED << 16 ), K_ALT_B },
{ SL_KEY_ALT( 'C' ) | ( ALTL_PRESSED << 16 ), K_ALT_C },

20
harbour/source/vm/extend.c
View File

@@ -473,7 +473,7 @@ int hb_parni( int iParam )
else if( HB_IS_LONG( pItem ) )
return ( int ) pItem->item.asLong.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( int ) ( unsigned int ) pItem->item.asDouble.value;
#else
return ( int ) pItem->item.asDouble.value;
@@ -501,7 +501,7 @@ int hb_parnidef( int iParam, int iDefValue )
else if( HB_IS_LONG( pItem ) )
return ( int ) pItem->item.asLong.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( int ) ( unsigned int ) pItem->item.asDouble.value;
#else
return ( int ) pItem->item.asDouble.value;
@@ -529,7 +529,7 @@ long hb_parnl( int iParam )
else if( HB_IS_INTEGER( pItem ) )
return ( long ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( long ) ( unsigned long ) pItem->item.asDouble.value;
#else
return ( long ) pItem->item.asDouble.value;
@@ -557,7 +557,7 @@ long hb_parnldef( int iParam, long lDefValue )
else if( HB_IS_INTEGER( pItem ) )
return ( long ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( long ) ( unsigned long ) pItem->item.asDouble.value;
#else
return ( long ) pItem->item.asDouble.value;
@@ -586,7 +586,7 @@ LONGLONG hb_parnll( int iParam )
else if( HB_IS_INTEGER( pItem ) )
return ( LONGLONG ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( LONGLONG ) ( ULONGLONG ) pItem->item.asDouble.value;
#else
return ( LONGLONG ) pItem->item.asDouble.value;
@@ -615,7 +615,7 @@ HB_LONG hb_parnint( int iParam )
else if( HB_IS_INTEGER( pItem ) )
return ( HB_LONG ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( HB_LONG ) ( HB_ULONG ) pItem->item.asDouble.value;
#else
return ( HB_LONG ) pItem->item.asDouble.value;
@@ -1061,7 +1061,7 @@ int hb_parvni( int iParam, ... )
else if( HB_IS_LONG( pItem ) )
return ( int ) pItem->item.asLong.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( int ) ( unsigned int ) pItem->item.asDouble.value;
#else
return ( int ) pItem->item.asDouble.value;
@@ -1100,7 +1100,7 @@ long hb_parvnl( int iParam, ... )
else if( HB_IS_INTEGER( pItem ) )
return ( long ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( long ) ( unsigned long ) pItem->item.asDouble.value;
#else
return ( long ) pItem->item.asDouble.value;
@@ -1143,7 +1143,7 @@ LONGLONG hb_parvnll( int iParam, ... )
else if( HB_IS_INTEGER( pItem ) )
return ( LONGLONG ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( LONGLONG ) ( ULONGLONG ) pItem->item.asDouble.value;
#else
return ( LONGLONG ) pItem->item.asDouble.value;
@@ -1183,7 +1183,7 @@ HB_LONG hb_parvnint( int iParam, ... )
else if( HB_IS_INTEGER( pItem ) )
return ( HB_LONG ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( HB_LONG ) ( HB_ULONG ) pItem->item.asDouble.value;
#else
return ( HB_LONG ) pItem->item.asDouble.value;

8
harbour/source/vm/itemapi.c
View File

@@ -620,7 +620,7 @@ int hb_itemGetNI( PHB_ITEM pItem )
return ( int ) pItem->item.asLong.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( int ) ( unsigned int ) pItem->item.asDouble.value;
#else
return ( int ) pItem->item.asDouble.value;
@@ -643,7 +643,7 @@ long hb_itemGetNL( PHB_ITEM pItem )
return ( long ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( long ) ( ULONG ) pItem->item.asDouble.value;
#else
return ( long ) pItem->item.asDouble.value;
@@ -670,7 +670,7 @@ HB_LONG hb_itemGetNInt( PHB_ITEM pItem )
return ( HB_LONG ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( HB_LONG ) ( HB_ULONG ) pItem->item.asDouble.value;
#else
return ( HB_LONG ) pItem->item.asDouble.value;
@@ -694,7 +694,7 @@ LONGLONG hb_itemGetNLL( PHB_ITEM pItem )
return ( LONGLONG ) pItem->item.asInteger.value;
else if( HB_IS_DOUBLE( pItem ) )
#ifdef __GNUC__
#if defined( __GNUC__ )
return ( LONGLONG ) ( ULONGLONG ) pItem->item.asDouble.value;
#else
return ( LONGLONG ) pItem->item.asDouble.value;