diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 62e90bc54f..256e1d3da5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,26 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ + + +2003-11-10 13:20 UTC+0100 Maurilio Longo + * harbour/contrib/btree/hb_btree.c + + added _CLIPDEFS_H define to let it compile on OS/2 GCC + * harbour/contrib/libct/bit1.c + * harbour/contrib/libct/bit3.c + * harbour/contrib/libct/ct.h + + added _CLIPDEFS_H define to let it compile on OS/2 GCC + * changed redefined base tipes to C ones, like WORD -> long, bit3.c was already + partly fixed before this one + * harbour/contrib/libnf/chdir.c + * harbour/contrib/libnf/dispc.c + * harbour/contrib/libnf/getenvrn.c + * harbour/contrib/libnf/kspeed.c + * harbour/contrib/libnf/mouse.c + * harbour/contrib/libnf/rmdir.c + + added _CLIPDEFS_H define to let it compile on OS/2 GCC, now it compiles, but a lot + of functions are DOS only + 2003-11-10 12:25 UTC+0100 Ryszard Glab * include/hbcomp.h * source/compiler/cmdcheck.c @@ -21,6 +41,7 @@ + added a new switch -kJ to disable jump optimalization and NOOP pcode removal (optimalization is enabled by default) + 2003-11-09 00:50 UTC+0300 Alexander Kresin * source/pp/pptable.c + SET MBLOCKSIZE TO @@ -144,14 +165,14 @@ * Latest RDD changes, has been made by Przemyslaw Czerpak - synced with xHarbour. 2003-10-30 19:50 UTC+0100 Ryszard Glab - * source/compiler/harbour.l - * source/compiler/harbour.y - *Fixed support for DO [WITH ...] command - The procedure name is not "uppercased" - For example: - DO MyProc - The compiler look for MyProc.prg file now - (instead of MYPROC.prg) + * source/compiler/harbour.l + * source/compiler/harbour.y + *Fixed support for DO [WITH ...] command + The procedure name is not "uppercased" + For example: + DO MyProc + The compiler look for MyProc.prg file now + (instead of MYPROC.prg) 2003-10-30 10:45 UTC+0100 Tomaz Zupan * source/rtl/alert.prg diff --git a/harbour/contrib/btree/hb_btree.c b/harbour/contrib/btree/hb_btree.c index 2c872791c1..c98d342a24 100644 --- a/harbour/contrib/btree/hb_btree.c +++ b/harbour/contrib/btree/hb_btree.c @@ -183,6 +183,9 @@ extern "C" { #else #endif +/* NOTE: we need this to prevent base types redefinition */ +#define _CLIPDEFS_H + #include "extend.api" #include "item.api" #include "hbapifs.h" @@ -638,7 +641,7 @@ static LONG StackSkip( struct hb_BTree * pBTree, BTreeStack **pStack, LONG recor if ( STACKPOSITION( pStack ) > 0 ) ulNode = BranchGet( pBTree, STACKNODE( pStack ), --STACKPOSITION( pStack ) ); else - ulNode = NULL; + ulNode = (ULONG) NULL; if ( !BTREENODEISNULL( pBTree, ulNode ) ) { StackPush( pStack, ulNode, CountGet( pBTree, ulNode ) ); diff --git a/harbour/contrib/libct/bit1.c b/harbour/contrib/libct/bit1.c index 8b369f6dc9..73b3a291e6 100644 --- a/harbour/contrib/libct/bit1.c +++ b/harbour/contrib/libct/bit1.c @@ -59,13 +59,13 @@ #include "ct.h" #include "clipdefs.h" -WORD static __hex2int( char *cNum1, int iLenHex ); -WORD static __getparam( int iParam ); -WORD static __numand( WORD wNum1, WORD wNum2 ); -WORD static __numor ( WORD wNum1, WORD wNum2 ); -WORD static __numxor( WORD wNum1, WORD wNum2 ); -WORD static __numnot( WORD wNum1, WORD wNum2 ); -long static __numfun( int iPCount, WORD (*operation)(WORD wNum1, WORD wNum2)); +long static __hex2int( char *cNum1, int iLenHex ); +long static __getparam( int iParam ); +long static __numand( long wNum1, long wNum2 ); +long static __numor ( long wNum1, long wNum2 ); +long static __numxor( long wNum1, long wNum2 ); +long static __numnot( long wNum1, long wNum2 ); +long static __numfun( int iPCount, long (*operation)(long wNum1, long wNum2)); /* $DOC$ @@ -76,7 +76,7 @@ long static __numfun( int iPCount, WORD (*operation)(WORD wNum1, WORD wNum2)); * $ONELINER$ * Bitwise logical AND operation on 16-bit numbers * $SYNTAX$ - * NUMAND( , [, ..) + * NUMAND( , [, ..) * -> * $ARGUMENTS$ * $RETURNS$ @@ -103,7 +103,7 @@ HB_FUNC( NUMAND ) iPCount = hb_pcount(); - hb_retnl( __numfun( iPCount, (WORD (*)(WORD wNum1, WORD wNum2))(__numand) ) ); + hb_retnl( __numfun( iPCount, (long (*)(long wNum1, long wNum2))(__numand) ) ); } @@ -115,7 +115,7 @@ HB_FUNC( NUMAND ) * $ONELINER$ * Bitwise logical OR operation on 16-bit numbers * $SYNTAX$ - * NUMOR( 1, [, ..) + * NUMOR( 1, [, ..) * -> * $ARGUMENTS$ * $RETURNS$ @@ -142,7 +142,7 @@ HB_FUNC( NUMOR ) iPCount = hb_pcount(); - hb_retnl( __numfun( iPCount, (WORD (*)(WORD wNum1, WORD wNum2))(__numor) ) ); + hb_retnl( __numfun( iPCount, (long (*)(long wNum1, long wNum2))(__numor) ) ); } @@ -182,7 +182,7 @@ HB_FUNC( NUMXOR ) iPCount = 2; - hb_retnl( __numfun( iPCount, (WORD (*)(WORD wNum1, WORD wNum2))(__numxor) ) ); + hb_retnl( __numfun( iPCount, (long (*)(long wNum1, long wNum2))(__numxor) ) ); } @@ -222,7 +222,7 @@ HB_FUNC( NUMNOT ) iPCount = 1; - hb_retnl( __numfun( iPCount, (WORD (*)(WORD wNum1, WORD wNum2))(__numnot) ) ); + hb_retnl( __numfun( iPCount, (long (*)(long wNum1, long wNum2))(__numnot) ) ); } @@ -234,7 +234,7 @@ HB_FUNC( NUMNOT ) * $ONELINER$ * Bitwise ROL (rotate left) operation on 16-bit numbers * $SYNTAX$ - * NUMROL( , [, ] ) + * NUMROL( , [, ] ) * -> * $ARGUMENTS$ * $RETURNS$ @@ -272,14 +272,14 @@ HB_FUNC( NUMROL ) } else usBytes = 16; - + usNum2 = usNum2 % usBytes; /* Set usNum2 < usBytes */ usPattern = (-1) << usBytes; usTestRol = 1 << ( usBytes - 1 ); /* Pattern to test the MSB */ - usNumBak = usNum1 & usPattern; /* usNumBak contain the section + usNumBak = usNum1 & usPattern; /* usNumBak contain the section to doesn't ROL */ for (usFor = 1; usFor <= usNum2; usFor++) @@ -332,7 +332,7 @@ HB_FUNC ( NUMMIRR ) USHORT usNum1, usBytes, usFor, usPattern = 0, usNumBak, usMirror = 0; usNum1 = (USHORT) __getparam( 1 ); - + if ( ISLOG( 2 ) ) /* if 3th parameter is LOGICAL */ { if ( hb_parl( 2 ) ) @@ -355,7 +355,7 @@ HB_FUNC ( NUMMIRR ) { if ( usNum1 & 1 ) { - + usMirror = usMirror << 1; /* if the LSB of usNum1 == 1 then */ usMirror = usMirror | 1; /* set the LSB of usMirror = 1 */ } @@ -381,11 +381,11 @@ HB_FUNC ( HEX2NUM ) } */ -WORD static __hex2int( char *cNum1, int iLenHex ) +long static __hex2int( char *cNum1, int iLenHex ) { int i; int iNum; - WORD uiHexNum = 0; + long uiHexNum = 0; i = ( iLenHex - 1 ); @@ -398,54 +398,54 @@ WORD static __hex2int( char *cNum1, int iLenHex ) if ((iNum < 0) || (iNum > 0x0F)) break; - - uiHexNum += (WORD) iNum * (1 << (4 * ( iLenHex - i - 1 ))); + + uiHexNum += (long) iNum * (1 << (4 * ( iLenHex - i - 1 ))); i--; } return uiHexNum; } -WORD static __getparam( int iParam ) +long static __getparam( int iParam ) { if ( ISCHAR( iParam ) ) return __hex2int( hb_parc( iParam ), hb_parclen( iParam ) ); else - return (WORD) hb_parnl( iParam ); + return (long) hb_parnl( iParam ); } -WORD static __numand( WORD uiNum1, WORD uiNum2 ) +long static __numand( long uiNum1, long uiNum2 ) { return uiNum1 & uiNum2; } -WORD static __numor( WORD uiNum1, WORD uiNum2 ) +long static __numor( long uiNum1, long uiNum2 ) { return uiNum1 | uiNum2; } -WORD static __numxor( WORD uiNum1, WORD uiNum2 ) +long static __numxor( long uiNum1, long uiNum2 ) { return uiNum1 ^ uiNum2; } -WORD static __numnot( WORD uiNum1, WORD uiNum2 ) +long static __numnot( long uiNum1, long uiNum2 ) { HB_SYMBOL_UNUSED (uiNum2); return ~uiNum1; } -long static __numfun( int iPCount, WORD (*operation)(WORD wNum1, WORD wNum2)) +long static __numfun( int iPCount, long (*operation)(long wNum1, long wNum2)) { - WORD uiNumOp = 0; - WORD uiNum1, uiNum2; + long uiNumOp = 0; + long uiNum1, uiNum2; int iFor; if ( ISNUM(1) || ISCHAR(1) ) @@ -479,7 +479,7 @@ long static __numfun( int iPCount, WORD (*operation)(WORD wNum1, WORD wNum2)) uiNum1 = uiNumOp; } - } + } } else diff --git a/harbour/contrib/libct/bit3.c b/harbour/contrib/libct/bit3.c index 91ca68f0cb..ce6456e5bf 100644 --- a/harbour/contrib/libct/bit3.c +++ b/harbour/contrib/libct/bit3.c @@ -65,8 +65,8 @@ long static __numand( long wNum1, long wNum2 ); long static __numor ( long wNum1, long wNum2 ); long static __numxor( long wNum1, long wNum2 ); long static __numnot( long wNum1, long wNum2 ); -long static __numfun( int iPCount, long (*operation)(long wNum1, long wNum2), BOOLP pbOk ); -void static sizeofbits( USHORTP pusBytes, LONGP plPattern, LONGP plTestMSB ); +long static __numfun( int iPCount, long (*operation)(long wNum1, long wNum2), BOOL * pbOk ); +void static sizeofbits( USHORT * pusBytes, LONG * plPattern, LONG * plTestMSB ); /* $DOC$ * $FUNCNAME$ @@ -78,7 +78,7 @@ void static sizeofbits( USHORTP pusBytes, LONGP plPattern, LONGP plTestMSB ); * NUMANDX( , , * [, ..) -> * $ARGUMENTS$ - * Designate a number in the range of 0 to 32, + * Designate a number in the range of 0 to 32, * indicating the LSB of nLONGx|cHexLONGx that will be used. * * Designate either decimal or hexadecimal @@ -140,7 +140,7 @@ HB_FUNC( NUMANDX ) * NUMORX( , 1, * [, ..) -> * $ARGUMENTS$ - * Designate a number in the range of 0 to 32, + * Designate a number in the range of 0 to 32, * indicating the LSB of nLONGx|cHexLONGx that will be used. * * Designate either decimal or hexadecimal @@ -202,7 +202,7 @@ HB_FUNC( NUMORX ) * NUMXORX( , , ) * -> * $ARGUMENTS$ - * Designate a number in the range of 0 to 32, + * Designate a number in the range of 0 to 32, * indicating the LSB of nLONGx|cHexLONGx that will be used. * * Designate either decimal or hexadecimal @@ -265,7 +265,7 @@ HB_FUNC( NUMXORX ) * $SYNTAX$ * NUMNOTX( , ) -> * $ARGUMENTS$ - * Designate a number in the range of 0 to 32, + * Designate a number in the range of 0 to 32, * indicating the LSB of nLONGx|cHexLONGx that will be used. * * Designate either decimal or hexadecimal @@ -326,10 +326,10 @@ HB_FUNC( NUMNOTX ) * CT3 number and bit manipulation functions * $ONELINER$ * $SYNTAX$ - * NUMROLX( , , ) + * NUMROLX( , , ) * -> * $ARGUMENTS$ - * Designate a number in the range of 0 to 32, + * Designate a number in the range of 0 to 32, * indicating the LSB of nLONGx|cHexLONGx that will be used. * * Designate either decimal or hexadecimal @@ -378,7 +378,7 @@ HB_FUNC( NUMROLX ) usNum2 = usNum2 % usBytes; /* Set usNum2 < usBytes */ - lNumBak = lNum1 & lPattern; /* lNumBak contain the section + lNumBak = lNum1 & lPattern; /* lNumBak contain the section to doesn't ROL */ for (usFor = 1; usFor <= usNum2; usFor++) @@ -411,14 +411,14 @@ HB_FUNC( NUMROLX ) * $SYNTAX$ * NUMMIRRX( , ) -> * $ARGUMENTS$ - * Designate a number in the range of 0 to 32, + * Designate a number in the range of 0 to 32, * indicating the LSB of nLONGx|cHexLONGx that will be used. * * Designate either decimal or hexadecimal * number string. * * $RETURNS$ - * NUMMIRR() returns a value by which the bit opposite the first + * NUMMIRR() returns a value by which the bit opposite the first * parameter is mirrored. * * $DESCRIPTION$ @@ -453,7 +453,7 @@ HB_FUNC ( NUMMIRRX ) if ( ISNUM(2) || ISCHAR(2) ) { lNum1 = __getparam( 2 ); - + sizeofbits( &usBytes, &lPattern, &lTestMSB ); lNumBak = lNum1 & lPattern; @@ -462,7 +462,7 @@ HB_FUNC ( NUMMIRRX ) { if ( lNum1 & 1 ) { - + lMirror = lMirror << 1; /* if the LSB of lNum1 == 1 then */ lMirror = lMirror | 1; /* set the LSB of lMirror = 1 */ } @@ -499,7 +499,7 @@ long static __hex2long( char *cNum1, int iLenHex ) if ((iNum < 0) || (iNum > 0x0F)) break; - + lHexNum += (unsigned long) iNum * (1 << (4 * ( iLenHex - i - 1 ))); i--; } @@ -543,7 +543,7 @@ long static __numnot( long lNum1, long lNum2 ) } -long static __numfun( int iPCount, long (*operation)(long wNum1, long wNum2), BOOLP pbOk ) +long static __numfun( int iPCount, long (*operation)(long wNum1, long wNum2), BOOL * pbOk ) { long lNumOp = 0; long lNum1, lNum2; @@ -589,7 +589,7 @@ long static __numfun( int iPCount, long (*operation)(long wNum1, long wNum2), BO lNum1 = lNumOp; } - } + } } else @@ -615,10 +615,10 @@ long static __numfun( int iPCount, long (*operation)(long wNum1, long wNum2), BO } -void static sizeofbits( USHORTP pusBytes, long *plPattern, long *plTestMSB ) +void static sizeofbits( USHORT * pusBytes, long *plPattern, long *plTestMSB ) { - *pusBytes = ((ISNIL(1) || hb_parni(1) == 0) ? sizeof( int ) * 8 + *pusBytes = ((ISNIL(1) || hb_parni(1) == 0) ? sizeof( int ) * 8 : (USHORT) hb_parni( 1 ) ); if ( *pusBytes > sizeof( long ) * 8 ) diff --git a/harbour/contrib/libct/ct.h b/harbour/contrib/libct/ct.h index 804d91e0f2..7f0010618e 100644 --- a/harbour/contrib/libct/ct.h +++ b/harbour/contrib/libct/ct.h @@ -3,7 +3,7 @@ */ /* - * Harbour Project source code: + * Harbour Project source code: * header for CT3 functions * * Copyright 2001 IntTec GmbH, Neunlindenstr 32, 79106 Freiburg, Germany @@ -56,6 +56,9 @@ #ifndef _CT_H #define _CT_H 1 +/* NOTE: we need this to prevent base types redefinition */ +#define _CLIPDEFS_H + #include "hbapi.h" #include "hbapiitm.h" #include "hbapierr.h" @@ -75,7 +78,7 @@ extern USHORT ct_error (USHORT uiSeverity, ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiOsCode, USHORT uiFlags, ULONG uiArgCount, ...); -extern PHB_ITEM ct_error_subst (USHORT uiSeverity, ULONG ulGenCode, ULONG ulSubCode, +extern PHB_ITEM ct_error_subst (USHORT uiSeverity, ULONG ulGenCode, ULONG ulSubCode, char * szDescription, char * szOperation, USHORT uiOsCode, USHORT uiFlags, ULONG uiArgCount, ...); diff --git a/harbour/contrib/libnf/chdir.c b/harbour/contrib/libnf/chdir.c index bea56518d2..46323b7906 100644 --- a/harbour/contrib/libnf/chdir.c +++ b/harbour/contrib/libnf/chdir.c @@ -76,7 +76,12 @@ Ends _NanFor End */ /* This is the New one Rewriten in C*/ - + + +/* NOTE: we need this to prevent base types redefinition */ +#define _CLIPDEFS_H + + #include "extend.h" #if defined(HB_OS_DOS) #include "dos.h" diff --git a/harbour/contrib/libnf/dispc.c b/harbour/contrib/libnf/dispc.c index 6ca5a42c85..c231a73374 100644 --- a/harbour/contrib/libnf/dispc.c +++ b/harbour/contrib/libnf/dispc.c @@ -46,6 +46,10 @@ */ +/* NOTE: we need this to prevent base types redefinition */ +#define _CLIPDEFS_H + + #include "hbdefs.h" #include "hbapi.h" #include "hbapifs.h" @@ -135,7 +139,7 @@ static void chattr(int x, int y, int len, int attr) int i; char *vmem; - vmem = vseg + (y * (width + 1) * 2) + (x * 2) + 1; + vmem = vseg + (y * (width + 1) * 2) + (x * 2) + 1; /* calc the screen memory coord */ for (i = 0; i <= len; i++, vmem += 2) /* write the new attribute value */ @@ -567,7 +571,7 @@ HB_FUNC( _FT_DFINIT ) lbuff = (char *) hb_xalloc(maxlin + 1); /* for buffers */ - isallocated = !(buffer == NULL || lbuff == NULL || vseg == NULL); + isallocated = !(buffer == NULL || lbuff == NULL || vseg == NULL); /* memory allocated? */ if (isallocated == FALSE) { @@ -767,7 +771,7 @@ HB_FUNC( FT_DISPFILE ) if ( brows == NO ) chattr(0, winrow - sline, width, norm); - + hb_gtRest( sline, scol, eline, ecol, vseg ); /* figure out what the user wants to do */ @@ -874,7 +878,7 @@ HB_FUNC( FT_DISPFILE ) } else ch = 0; - + /* store the key pressed as a character to be returned */ @@ -915,7 +919,7 @@ static int keyin() ch = 27; /* ESC with CapsLock ON = 257, with CapsLock OFF = 27 */ hb_idleState(); } - + return ( ch ); } diff --git a/harbour/contrib/libnf/getenvrn.c b/harbour/contrib/libnf/getenvrn.c index d5afb4b2e2..8c1f221e02 100644 --- a/harbour/contrib/libnf/getenvrn.c +++ b/harbour/contrib/libnf/getenvrn.c @@ -95,6 +95,9 @@ * $END$ */ +/* NOTE: we need this to prevent base types redefinition */ +#define _CLIPDEFS_H + #include #include @@ -114,7 +117,7 @@ HB_FUNC(FT_GETE) */ #if defined(HB_OS_DOS) || defined(HB_OS_WIN_32) { - + extern char **_environ; char *buffer = NULL; int x; diff --git a/harbour/contrib/libnf/kspeed.c b/harbour/contrib/libnf/kspeed.c index 5431cf4712..664c1a3c4e 100644 --- a/harbour/contrib/libnf/kspeed.c +++ b/harbour/contrib/libnf/kspeed.c @@ -143,6 +143,9 @@ _NanFor ENDS /* This is the New one Rewriten in C*/ +/* NOTE: we need this to prevent base types redefinition */ +#define _CLIPDEFS_H + #include "extend.h" #if defined(HB_OS_DOS) #include "dos.h" @@ -156,15 +159,15 @@ HB_FUNC( FT_SETRATE) union REGS registers; int tempo = 0,nrepete = 0; switch( hb_pcount() ) { - case 0: + case 0: tempo = 0 ; nrepete = 0; break; - case 1: + case 1: tempo = hb_parni(1) ; nrepete = 0; break; - case 2: + case 2: tempo = hb_parni(1); nrepete = hb_parni(2); break; @@ -179,4 +182,4 @@ HB_FUNC( FT_SETRATE) } - + diff --git a/harbour/contrib/libnf/mouse.c b/harbour/contrib/libnf/mouse.c index cf2df4fb9f..785f36b646 100644 --- a/harbour/contrib/libnf/mouse.c +++ b/harbour/contrib/libnf/mouse.c @@ -51,6 +51,9 @@ * */ +/* NOTE: we need this to prevent base types redefinition */ +#define _CLIPDEFS_H + #include "extend.h" #if defined(HB_OS_DOS) #include "dos.h" @@ -101,7 +104,7 @@ HB_FUNC(_MGET_MVERSION) #if defined(HB_OS_DOS) { union REGS regs; - + regs.HB_XREGS.ax = 0x24; HB_DOS_INT86( 0x33, ®s, ®s ); @@ -119,12 +122,12 @@ HB_FUNC(_MGET_MVERSION) } #endif - { + { PHB_ITEM pArray = hb_itemArrayNew( 4 ); - + PHB_ITEM pMinor = hb_itemPutNI( NULL, iMinor ); PHB_ITEM pType = hb_itemPutNI( NULL, iType ); - PHB_ITEM pIRQ = hb_itemPutNI( NULL, iIRQ ); + PHB_ITEM pIRQ = hb_itemPutNI( NULL, iIRQ ); PHB_ITEM pMajor = hb_itemPutNI( NULL, iMajor ); hb_itemArrayPut( pArray, 1, pMinor ); @@ -167,7 +170,7 @@ HB_FUNC(_MGET_VERSPEED) { int iSpeed; #if defined(HB_OS_DOS) - { + { union REGS regs; regs.HB_XREGS.ax=0x1B; HB_DOS_INT86(0x33,®s,®s); @@ -186,7 +189,7 @@ HB_FUNC(_MGET_DOUBLESPEED) { int iSpeed; #if defined(HB_OS_DOS) - { + { union REGS regs; regs.HB_XREGS.ax=0x1B; HB_DOS_INT86(0x33,®s,®s); @@ -410,7 +413,7 @@ HB_FUNC( _M_MSETCOORD) regs.HB_XREGS.dx=hb_parni(2); HB_DOS_INT86(0x33,®s,®s); } -#endif +#endif } HB_FUNC( _M_MXLIMIT) @@ -488,13 +491,13 @@ HB_FUNC( _M_MBUTPRS) hb_itemArrayPut( pArray, 3, pY ); hb_itemArrayPut( pArray, 4, pStatus ); /* NOTE: I've changed 1 to 3 */ hb_itemReturn(pArray); - + hb_itemRelease(pArray); hb_itemRelease(pX); hb_itemRelease(pY); hb_itemRelease(pStatus); hb_itemRelease(pButton); - } + } } HB_FUNC( _M_MDEFCRS) @@ -523,8 +526,8 @@ int inButton; #if defined(HB_OS_DOS) { union REGS regs; - regs.HB_XREGS.ax=3; - HB_DOS_INT86(0x33,®s,®s); + regs.HB_XREGS.ax=3; + HB_DOS_INT86(0x33,®s,®s); inButton=regs.HB_XREGS.bx; inY=regs.HB_XREGS.cx; @@ -550,7 +553,7 @@ int inButton; hb_itemArrayPut( pArray, 1, pnX ); hb_itemArrayPut( pArray, 2, pnY ); - hb_itemArrayPut( pArray, 3, pnButton ); + hb_itemArrayPut( pArray, 3, pnButton ); hb_itemReturn(pArray); diff --git a/harbour/contrib/libnf/rmdir.c b/harbour/contrib/libnf/rmdir.c index 32bc1cb5f4..cffddc4c66 100644 --- a/harbour/contrib/libnf/rmdir.c +++ b/harbour/contrib/libnf/rmdir.c @@ -79,6 +79,9 @@ End /* This is the New one Rewriten in C*/ +/* NOTE: we need this to prevent base types redefinition */ +#define _CLIPDEFS_H + #include "extend.h" #if defined(HB_OS_DOS) #include "dos.h"