From 6e4311bae95cb5c1c2c42db63b7c0a9cf420eda7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 17 Aug 2009 12:13:52 +0000 Subject: [PATCH] 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() --- harbour/ChangeLog | 7 +++++++ harbour/source/rtl/fserr.c | 2 +- harbour/source/rtl/gtsln/keytrans.c | 2 +- harbour/source/vm/extend.c | 20 ++++++++++---------- harbour/source/vm/itemapi.c | 8 ++++---- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 43bbcfb83b..860f9e6c3e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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 * source/debug/tbrwtext.prg ! Fixed RTE on deleting the last tracepoint. diff --git a/harbour/source/rtl/fserr.c b/harbour/source/rtl/fserr.c index f4499d90a4..910eddaa32 100644 --- a/harbour/source/rtl/fserr.c +++ b/harbour/source/rtl/fserr.c @@ -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() ); diff --git a/harbour/source/rtl/gtsln/keytrans.c b/harbour/source/rtl/gtsln/keytrans.c index c63a2fc364..d9a39da802 100644 --- a/harbour/source/rtl/gtsln/keytrans.c +++ b/harbour/source/rtl/gtsln/keytrans.c @@ -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 }, diff --git a/harbour/source/vm/extend.c b/harbour/source/vm/extend.c index 38ae131dc0..3c854493eb 100644 --- a/harbour/source/vm/extend.c +++ b/harbour/source/vm/extend.c @@ -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; diff --git a/harbour/source/vm/itemapi.c b/harbour/source/vm/itemapi.c index 8fdddba0c3..e6e9d6c9ad 100644 --- a/harbour/source/vm/itemapi.c +++ b/harbour/source/vm/itemapi.c @@ -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;