From c0ff8439bed1c607da40a8cf878514a91fa428bd Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 2 Jul 2009 17:02:40 +0000 Subject: [PATCH] 2009-07-02 19:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/Makefile * Formatting. * include/filesys.api % Cleaned cast. * contrib/gtwvg/wvgwing.c ! Fixed x64 bug. * examples/hbgf/hbgfos2/os2pm.c * LONG -> long --- harbour/contrib/gtwvg/wvgwing.c | 6 +- harbour/examples/hbgf/hbgfos2/os2pm.c | 12 +- harbour/include/Makefile | 224 +++++++++++++------------- harbour/include/filesys.api | 4 +- 4 files changed, 123 insertions(+), 123 deletions(-) diff --git a/harbour/contrib/gtwvg/wvgwing.c b/harbour/contrib/gtwvg/wvgwing.c index b1d2168d91..2039fe7371 100644 --- a/harbour/contrib/gtwvg/wvgwing.c +++ b/harbour/contrib/gtwvg/wvgwing.c @@ -1174,10 +1174,10 @@ LRESULT CALLBACK ControlWindowProcedure( HWND hwnd, UINT msg, WPARAM wParam, LPA hb_vmPushSymbol( &hb_symEval ); hb_vmPush( pBlock ); } - hb_vmPushLong( ( HB_PTRDIFF ) hwnd ); + hb_vmPushNumInt( ( HB_PTRDIFF ) hwnd ); hb_vmPushInteger( msg ); - hb_vmPushLong( ( HB_PTRDIFF ) wParam ); - hb_vmPushLong( ( HB_PTRDIFF ) lParam ); + hb_vmPushNumInt( ( HB_PTRDIFF ) wParam ); + hb_vmPushNumInt( ( HB_PTRDIFF ) lParam ); hb_vmDo( 4 ); lRet = ( long ) hb_parnint( -1 ); return lRet; diff --git a/harbour/examples/hbgf/hbgfos2/os2pm.c b/harbour/examples/hbgf/hbgfos2/os2pm.c index fac0d23422..d301f2a003 100644 --- a/harbour/examples/hbgf/hbgfos2/os2pm.c +++ b/harbour/examples/hbgf/hbgfos2/os2pm.c @@ -88,15 +88,15 @@ MRESULT EXPENTRY WndProc( HWND hWnd, ULONG Msg, MPARAM mp1, MPARAM mp2 ) hb_vmPushState(); hb_vmPushDynSym( s_pDynSym ); hb_vmPushNil(); - hb_vmPushLong( ( LONG ) hWnd ); - hb_vmPushLong( ( LONG ) Msg ); - hb_vmPushLong( ( LONG ) mp1 ); - hb_vmPushLong( ( LONG ) mp2 ); + hb_vmPushLong( ( long ) hWnd ); + hb_vmPushLong( ( long ) Msg ); + hb_vmPushLong( ( long ) mp1 ); + hb_vmPushLong( ( long ) mp2 ); hb_vmDo( 4 ); if( hb_arrayGetType( hb_param( -1, HB_IT_ANY ), 1 ) == HB_IT_NIL ) - mResult = (MRESULT) WinDefWindowProc( hWnd, Msg, mp1, mp2 ); + mResult = ( MRESULT ) WinDefWindowProc( hWnd, Msg, mp1, mp2 ); else - mResult = (MRESULT) hb_parnl( -1, 1 ); + mResult = ( MRESULT ) hb_parnl( -1, 1 ); hb_vmPopState(); return mResult; diff --git a/harbour/include/Makefile b/harbour/include/Makefile index 64e471fa01..76ac191a7f 100644 --- a/harbour/include/Makefile +++ b/harbour/include/Makefile @@ -5,121 +5,121 @@ ROOT = ../ C_HEADERS=\ - clipdefs.h \ - extend.h \ - hbapi.h \ - hbapicdp.h \ - hbapicls.h \ - hbapidbg.h \ - hbapierr.h \ - hbapifs.h \ - hbapigt.h \ - hbapiitm.h \ - hbapilng.h \ - hbapirdd.h \ - hbassert.h \ - hbatomic.h \ - hbchksum.h \ - hbcomp.h \ - hbcompdf.h \ - hbdate.h \ - hbdbf.h \ - hbdbferr.h \ - hbdbsort.h \ - hbdefs.h \ - hberrors.h \ - hbexprop.h \ - hbgtcore.h \ - hbhash.h \ - hbinit.h \ - hbmacro.h \ - hbmath.h \ - hbpcode.h \ - hbpp.h \ - hbrddcdx.h \ - hbrdddbf.h \ - hbrddfpt.h \ - hbrdddel.h \ - hbrddntx.h \ - hbrddsdf.h \ - hbrddnsx.h \ - hbregex.h \ - hbset.h \ - hbsetup.h \ - hbstack.h \ - hbsxfunc.h \ - hbthread.h \ - hbtrace.h \ - hbtypes.h \ - hbver.h \ - hbvm.h \ - hbvmint.h \ - hbvmopt.h \ - hbvmpub.h \ - hbxvm.h \ - hbwince.h \ - hbzlib.h \ - hb_io.h \ + clipdefs.h \ + extend.h \ + hbapi.h \ + hbapicdp.h \ + hbapicls.h \ + hbapidbg.h \ + hbapierr.h \ + hbapifs.h \ + hbapigt.h \ + hbapiitm.h \ + hbapilng.h \ + hbapirdd.h \ + hbassert.h \ + hbatomic.h \ + hbchksum.h \ + hbcomp.h \ + hbcompdf.h \ + hbdate.h \ + hbdbf.h \ + hbdbferr.h \ + hbdbsort.h \ + hbdefs.h \ + hberrors.h \ + hbexprop.h \ + hbgtcore.h \ + hbhash.h \ + hbinit.h \ + hbmacro.h \ + hbmath.h \ + hbpcode.h \ + hbpp.h \ + hbrddcdx.h \ + hbrdddbf.h \ + hbrddfpt.h \ + hbrdddel.h \ + hbrddntx.h \ + hbrddsdf.h \ + hbrddnsx.h \ + hbregex.h \ + hbset.h \ + hbsetup.h \ + hbstack.h \ + hbsxfunc.h \ + hbthread.h \ + hbtrace.h \ + hbtypes.h \ + hbver.h \ + hbvm.h \ + hbvmint.h \ + hbvmopt.h \ + hbvmpub.h \ + hbxvm.h \ + hbwince.h \ + hbzlib.h \ + hb_io.h \ PRG_HEADERS=\ - achoice.ch \ - assert.ch \ - box.ch \ - button.ch \ - blob.ch \ - color.ch \ - common.ch \ - dbedit.ch \ - dbinfo.ch \ - dbstruct.ch \ - directry.ch \ - error.ch \ - fileio.ch \ - getexit.ch \ - hbclass.ch \ - hbdebug.ch \ - hbextern.ch \ - hbgetcmt.ch \ - hbgfx.ch \ - hbgfxdef.ch \ - hbgtinfo.ch \ - hbhrb.ch \ - hbinkey.ch \ - hblang.ch \ - hbmacro.ch \ - hbmath.ch \ - hbmemory.ch \ - hbmemvar.ch \ - hboo.ch \ - hbpers.ch \ - hbsetup.ch \ - hbsix.ch \ - hbstdgen.ch \ - hbthread.ch \ - hbusrrdd.ch \ - hbver.ch \ - hbzlib.ch \ - inkey.ch \ - memoedit.ch \ - ord.ch \ - rddsys.ch \ - reserved.ch \ - set.ch \ - setcurs.ch \ - simpleio.ch \ - std.ch \ - hbsxdef.ch \ - tbrowse.ch \ + achoice.ch \ + assert.ch \ + box.ch \ + button.ch \ + blob.ch \ + color.ch \ + common.ch \ + dbedit.ch \ + dbinfo.ch \ + dbstruct.ch \ + directry.ch \ + error.ch \ + fileio.ch \ + getexit.ch \ + hbclass.ch \ + hbdebug.ch \ + hbextern.ch \ + hbgetcmt.ch \ + hbgfx.ch \ + hbgfxdef.ch \ + hbgtinfo.ch \ + hbhrb.ch \ + hbinkey.ch \ + hblang.ch \ + hbmacro.ch \ + hbmath.ch \ + hbmemory.ch \ + hbmemvar.ch \ + hboo.ch \ + hbpers.ch \ + hbsetup.ch \ + hbsix.ch \ + hbstdgen.ch \ + hbthread.ch \ + hbusrrdd.ch \ + hbver.ch \ + hbzlib.ch \ + inkey.ch \ + memoedit.ch \ + ord.ch \ + rddsys.ch \ + reserved.ch \ + set.ch \ + setcurs.ch \ + simpleio.ch \ + std.ch \ + hbsxdef.ch \ + tbrowse.ch \ API_HEADERS=\ - error.api \ - extend.api \ - filesys.api \ - fm.api \ - gt.api \ - hbundoc.api \ - item.api \ - rdd.api \ - vm.api \ + error.api \ + extend.api \ + filesys.api \ + fm.api \ + gt.api \ + hbundoc.api \ + item.api \ + rdd.api \ + vm.api \ include $(TOP)$(ROOT)config/header.cf diff --git a/harbour/include/filesys.api b/harbour/include/filesys.api index 8130e502e2..fecc99b6d5 100644 --- a/harbour/include/filesys.api +++ b/harbour/include/filesys.api @@ -92,10 +92,10 @@ typedef FHANDLE * FHANDLEP; #define _fsLock hb_fsLock #define _fsMkDir hb_fsMkDir #define _fsOpen hb_fsOpen -#define _fsRead( a, b, c ) hb_fsRead( a, ( BYTE * ) ( b ), c ) +#define _fsRead hb_fsRead #define _fsRmDir hb_fsRmDir #define _fsRename hb_fsRename #define _fsSeek hb_fsSeek -#define _fsWrite( a, b, c ) hb_fsWrite( a, ( BYTE * ) ( b ), c ) +#define _fsWrite hb_fsWrite #endif /* _FILESYS_API */