From 4a6f109e4b1c83a524fb542ef3740acc18d592bd Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 1 Mar 2007 13:15:01 +0000 Subject: [PATCH] 2007-03-01 14:10 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/os2/global.cf * harbour/contrib/hgf/os2pm/os2pm.c * harbour/include/hbdefs.h * harbour/include/hbgtcore.h * harbour/source/rdd/dbcmd.c * harbour/source/vm/mainpm.c * cleaned OS2 build errors and warnings reported by David Macias. Modifications not tested - OS2 users will have to make tests and reports problems. --- harbour/ChangeLog | 11 +++++++++++ harbour/config/os2/global.cf | 2 ++ harbour/contrib/hgf/os2pm/os2pm.c | 4 ++-- harbour/include/hbdefs.h | 13 +++++++++++++ harbour/include/hbgtcore.h | 2 +- harbour/source/rdd/dbcmd.c | 4 ++-- harbour/source/vm/mainpm.c | 5 +---- 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 933c90ad51..043f5f8425 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-03-01 14:10 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/os2/global.cf + * harbour/contrib/hgf/os2pm/os2pm.c + * harbour/include/hbdefs.h + * harbour/include/hbgtcore.h + * harbour/source/rdd/dbcmd.c + * harbour/source/vm/mainpm.c + * cleaned OS2 build errors and warnings reported by David Macias. + Modifications not tested - OS2 users will have to make tests and + reports problems. + 2007-03-01 05:22 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/pp/ppcore.c ! fixed comments like /*/*/ diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf index 68badcccef..b4d995be2c 100644 --- a/harbour/config/os2/global.cf +++ b/harbour/config/os2/global.cf @@ -18,6 +18,8 @@ ifeq ($(SHLVL),) # An OS/2 command shell ARCH_DIR = $(HB_ARCH) OS2_ARCH_DIR = $(subst /,\,$(HB_ARCH)) +DIRSEP = $(subst /,\,\) + MK = $(subst /,\,$(subst \~,~,$(MAKE))) ifeq ($(OS2_SHELL),) diff --git a/harbour/contrib/hgf/os2pm/os2pm.c b/harbour/contrib/hgf/os2pm/os2pm.c index 3875da808f..e742119df4 100644 --- a/harbour/contrib/hgf/os2pm/os2pm.c +++ b/harbour/contrib/hgf/os2pm/os2pm.c @@ -291,8 +291,8 @@ HB_FUNC( WINSETOWNER ) HB_FUNC( WINSENDMSG ) { hb_retnl( ( LONG ) WinSendMsg( ( HWND ) hb_parnl( 1 ), hb_parnl( 2 ), - ( MPARAM ) IF( ISCHAR( 3 ), (ULONG) hb_parc( 3 ), hb_parnl( 3 ) ), - ( MPARAM ) IF( ISCHAR( 4 ), (ULONG) hb_parc( 4 ), hb_parnl( 4 ) ) ) ); + ( MPARAM ) IF( ISCHAR( 3 ), (ULONG) hb_parc( 3 ), (ULONG) hb_parnl( 3 ) ), + ( MPARAM ) IF( ISCHAR( 4 ), (ULONG) hb_parc( 4 ), (ULONG) hb_parnl( 4 ) ) ) ); } diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index f0c22ba2ec..cda2fa4a28 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -251,6 +251,19 @@ #endif #endif /* HB_LONG_LONG_OFF */ +#else /* HB_DONT_DEFINE_BASIC_TYPES */ + + /* + * if HB_DONT_DEFINE_BASIC_TYPES excluded some types which are not + * defined in included platform dependent header files then please + * add necessary definitions here. + */ + + /* SCHAR is needed using GCC on OS/2 */ + #if ! defined( SCHAR ) + typedef signed char SCHAR; /* 1 byte signed */ + #endif + #endif /* HB_DONT_DEFINE_BASIC_TYPES */ /* diff --git a/harbour/include/hbgtcore.h b/harbour/include/hbgtcore.h index 36a6a075ba..d6b0f99cc8 100644 --- a/harbour/include/hbgtcore.h +++ b/harbour/include/hbgtcore.h @@ -180,7 +180,7 @@ typedef struct void (* Bell) ( void ); BOOL (* Info) ( int, PHB_GT_INFO ); int (* Alert) ( PHB_ITEM, PHB_ITEM, int, int, double ); - BOOL (* SetFlag) ( int, int ); + int (* SetFlag) ( int, int ); /* internationalization */ BOOL (* SetDispCP) ( char *, char *, BOOL ); diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c index b7044471b4..bb96ba85c5 100644 --- a/harbour/source/rdd/dbcmd.c +++ b/harbour/source/rdd/dbcmd.c @@ -2155,7 +2155,7 @@ HB_FUNC( DBSEEK ) if( !ISNIL( 1 ) ) { pKey = hb_param( 1, HB_IT_ANY ); - bSoftSeek = ISLOG( 2 ) ? hb_parl( 2 ) : hb_set.HB_SET_SOFTSEEK; + bSoftSeek = ISLOG( 2 ) ? ( BOOL ) hb_parl( 2 ) : hb_set.HB_SET_SOFTSEEK; bFindLast = ISLOG( 3 ) ? hb_parl( 3 ) : FALSE; if( SELF_SEEK( pArea, bSoftSeek, pKey, bFindLast ) == SUCCESS ) { @@ -2853,7 +2853,7 @@ HB_FUNC( ORDCREATE ) dbOrderInfo.abBagName = ( BYTE * ) hb_parcx( 1 ); dbOrderInfo.atomBagName = ( BYTE * ) hb_parcx( 2 ); dbOrderInfo.itmOrder = NULL; - dbOrderInfo.fUnique = ISLOG( 5 ) ? hb_parl( 5 ) : hb_set.HB_SET_UNIQUE; + dbOrderInfo.fUnique = ISLOG( 5 ) ? ( BOOL ) hb_parl( 5 ) : hb_set.HB_SET_UNIQUE; dbOrderInfo.abExpr = hb_param( 3, HB_IT_STRING ); if( ( ( dbOrderInfo.abBagName == NULL || strlen( ( char * ) dbOrderInfo.abBagName ) == 0 ) && ( dbOrderInfo.atomBagName == NULL || strlen( ( char * ) dbOrderInfo.atomBagName ) == 0 ) ) || diff --git a/harbour/source/vm/mainpm.c b/harbour/source/vm/mainpm.c index f59757cc39..1026ed12e6 100644 --- a/harbour/source/vm/mainpm.c +++ b/harbour/source/vm/mainpm.c @@ -61,7 +61,7 @@ int main( int argc, char * argv[] ) { - int ; + int iErrorCode; HAB hab; /* Anchor Block handle */ HMQ hmq; /* Message Queue handle */ @@ -77,6 +77,3 @@ int main( int argc, char * argv[] ) return iErrorCode; } - - -