From 1dfda632307d74195df71a9bbd21a8db4943a50f Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Tue, 5 Jul 2011 05:49:24 +0000 Subject: [PATCH] 2011-07-05 07:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/pp/ppcore.c % removed dummy (always false) condition * harbour/src/rtl/arc4.c ! do not uses sysctl() in Android builds --- harbour/ChangeLog | 7 +++++++ harbour/src/pp/ppcore.c | 2 +- harbour/src/rtl/arc4.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f019df730a..f247af7f4b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-07-05 07:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/src/pp/ppcore.c + % removed dummy (always false) condition + + * harbour/src/rtl/arc4.c + ! do not uses sysctl() in Android builds + 2011-07-04 20:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbwin/tests/testsvc.prg + added comment about 'S' internal parameter diff --git a/harbour/src/pp/ppcore.c b/harbour/src/pp/ppcore.c index 6854156033..7b843bdd69 100644 --- a/harbour/src/pp/ppcore.c +++ b/harbour/src/pp/ppcore.c @@ -1669,7 +1669,7 @@ static HB_BOOL hb_pp_tokenValueCmp( PHB_PP_TOKEN pToken, const char * szValue, H ( HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_KEYWORD || HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_STRING || HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_TEXT ) ) - return hb_strnicmp( szValue, pToken->value, pToken->len < 4 ? 4 : pToken->len ) == 0; + return hb_strnicmp( szValue, pToken->value, pToken->len ) == 0; else return hb_stricmp( szValue, pToken->value ) == 0; } diff --git a/harbour/src/rtl/arc4.c b/harbour/src/rtl/arc4.c index eb113e97a1..73cc46e81a 100644 --- a/harbour/src/rtl/arc4.c +++ b/harbour/src/rtl/arc4.c @@ -52,7 +52,8 @@ #include "hbthread.h" /* XXX: Check and possibly extend this to other Unix-like platforms */ -#if ( defined( HB_OS_BSD ) && ! defined( HB_OS_DARWIN ) ) || ( defined( HB_OS_LINUX ) && ! defined ( __WATCOMC__ ) ) +#if ( defined( HB_OS_BSD ) && ! defined( HB_OS_DARWIN ) ) || \ + ( defined( HB_OS_LINUX ) && ! defined ( HB_OS_ANDROID ) && ! defined ( __WATCOMC__ ) ) # define HAVE_SYS_SYSCTL_H # define HAVE_DECL_CTL_KERN # define HAVE_DECL_KERN_RANDOM