20000321-12:32 GMT+1 Victor Szakats <info@szelvesz.hu>

harbour/source/rdd/dbfcdx/dbfcdx1.c

@@ -95,12 +95,12 @@ typedef struct _DBFMEMO
 typedef DBFMEMO * LPDBFMEMO;
 
 
-HARBOUR HB__DBFCDX( void );
-HARBOUR HB_DBFCDX_GETFUNCTABLE( void );
+HB_FUNC( _DBFCDX );
+HB_FUNC( DBFCDX_GETFUNCTABLE );
 
 HB_INIT_SYMBOLS_BEGIN( dbfcdx1__InitSymbols )
-{ "_DBFCDX",             _HB_FS_PUBLIC, HB__DBFCDX,             0 },
-{ "DBFCDX_GETFUNCTABLE", _HB_FS_PUBLIC, HB_DBFCDX_GETFUNCTABLE, 0 }
+{ "_DBFCDX",             HB_FS_PUBLIC, HB_FUNCNAME( _DBFCDX ), NULL },
+{ "DBFCDX_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DBFCDX_GETFUNCTABLE ), NULL }
 HB_INIT_SYMBOLS_END( dbfcdx1__InitSymbols )
 #if ! defined(__GNUC__) && ! defined(_MSC_VER)
    #pragma startup dbfcdx1__InitSymbols
@@ -924,11 +924,11 @@ static RDDFUNCS cdxTable = { cdxBof,
                              cdxWhoCares
                            };
 
-HARBOUR HB__DBFCDX( void )
+HB_FUNC( _DBFCDX )
 {
 }
 
-HARBOUR HB_DBFCDX_GETFUNCTABLE( void )
+HB_FUNC( DBFCDX_GETFUNCTABLE )
 {
    RDDFUNCS * pTable;
    USHORT * uiCount;

harbour/source/rdd/dbfntx/dbfntx1.c

@@ -41,12 +41,12 @@
 #include "hbapirdd.h"
 #include "rddsys.ch"
 
-HARBOUR HB__DBFNTX( void );
-HARBOUR HB_DBFNTX_GETFUNCTABLE( void );
+HB_FUNC( _DBFNTX );
+HB_FUNC( DBFNTX_GETFUNCTABLE );
 
 HB_INIT_SYMBOLS_BEGIN( dbfntx1__InitSymbols )
-{ "_DBFNTX",             _HB_FS_PUBLIC, HB__DBFNTX,             0 },
-{ "DBFNTX_GETFUNCTABLE", _HB_FS_PUBLIC, HB_DBFNTX_GETFUNCTABLE, 0 }
+{ "_DBFNTX",             HB_FS_PUBLIC, HB_FUNCNAME( _DBFNTX ), NULL },
+{ "DBFNTX_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DBFNTX_GETFUNCTABLE ), NULL }
 HB_INIT_SYMBOLS_END( dbfntx1__InitSymbols )
 #if ! defined(__GNUC__) && ! defined(_MSC_VER)
    #pragma startup dbfntx1__InitSymbols
@@ -60,11 +60,11 @@ static RDDFUNCS ntxSuper = { 0 };
 
 static RDDFUNCS ntxTable = { 0 };
 
-HARBOUR HB__DBFNTX( void )
+HB_FUNC( _DBFNTX )
 {
 }
 
-HARBOUR HB_DBFNTX_GETFUNCTABLE( void )
+HB_FUNC( DBFNTX_GETFUNCTABLE )
 {
    RDDFUNCS * pTable;
    USHORT * uiCount;

harbour/source/rtl/Makefile

@@ -56,6 +56,7 @@ C_SOURCES=\
         mlpos.c      \
         mod.c        \
         mouseapi.c   \
+        mousex.c     \
         mtran.c      \
         natmsg.c     \
         net.c        \

harbour/source/rtl/abs.c

@@ -37,7 +37,7 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 
-HARBOUR HB_ABS( void )
+HB_FUNC( ABS )
 {
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );
 

harbour/source/rtl/accept.c

@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB___ACCEPTSTR()
+ *    __ACCEPTSTR()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -48,20 +48,20 @@
 #include "hbapigt.h"
 #include "inkey.ch"
 
-extern HARBOUR HB_QOUT( void );
+extern HB_FUNC( QOUT );
 
 #define ACCEPT_BUFFER_LEN 256 /* length of input buffer for ACCEPT command */
 
 static char s_szAcceptResult[ ACCEPT_BUFFER_LEN ] = { '\0' };
 
-HARBOUR HB___ACCEPT( void )
+HB_FUNC( __ACCEPT )
 {
    int input;
    ULONG ulLen;
 
    /* cPrompt(s) passed ? */
    if( hb_pcount() >= 1 )
-      HB_QOUT();
+      HB_FUNCNAME( QOUT )();
 
    ulLen = 0;
    input = 0;
@@ -96,7 +96,7 @@ HARBOUR HB___ACCEPT( void )
    hb_retc( s_szAcceptResult );
 }
 
-HARBOUR HB___ACCEPTSTR( void )
+HB_FUNC( __ACCEPTSTR )
 {
    hb_retc( s_szAcceptResult );
 }

harbour/source/rtl/ampm.c

@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_AMPM( void )
+HB_FUNC( AMPM )
 {
    char * pszTime = hb_parc( 1 );
    ULONG  ulTimeLen = hb_parclen( 1 );

harbour/source/rtl/at.c

@@ -40,7 +40,7 @@
 /* locates a substring in a string */
 /* TEST: QOUT( "at( 'cde', 'abcdefgfedcba' ) = '" + at( 'cde', 'abcsefgfedcba' ) + "'" ) */
 
-HARBOUR HB_AT( void )
+HB_FUNC( AT )
 {
    PHB_ITEM pSub = hb_param( 1, IT_STRING );
    PHB_ITEM pText = hb_param( 2, IT_STRING );

harbour/source/rtl/binnum.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_BIN2W( void )
+HB_FUNC( BIN2W )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
@@ -56,7 +56,7 @@ HARBOUR HB_BIN2W( void )
       hb_retni( 0 );
 }
 
-HARBOUR HB_BIN2I( void )
+HB_FUNC( BIN2I )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
@@ -76,7 +76,7 @@ HARBOUR HB_BIN2I( void )
       hb_retni( 0 );
 }
 
-HARBOUR HB_BIN2L( void )
+HB_FUNC( BIN2L )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
@@ -100,7 +100,7 @@ HARBOUR HB_BIN2L( void )
       hb_retnl( 0 );
 }
 
-HARBOUR HB_I2BIN( void )
+HB_FUNC( I2BIN )
 {
    char szString[ 2 ];
 
@@ -120,7 +120,7 @@ HARBOUR HB_I2BIN( void )
    hb_retclen( szString, 2 );
 }
 
-HARBOUR HB_L2BIN( void )
+HB_FUNC( L2BIN )
 {
    char szString[ 4 ];
 

harbour/source/rtl/binnumx.c

@@ -40,7 +40,7 @@
 
 #ifdef HB_COMPAT_XPP
 
-HARBOUR HB_BIN2U( void )
+HB_FUNC( BIN2U )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
@@ -64,7 +64,7 @@ HARBOUR HB_BIN2U( void )
       hb_retnl( 0 );
 }
 
-HARBOUR HB_W2BIN( void )
+HB_FUNC( W2BIN )
 {
    char szString[ 2 ];
 
@@ -84,7 +84,7 @@ HARBOUR HB_W2BIN( void )
    hb_retclen( szString, 2 );
 }
 
-HARBOUR HB_U2BIN( void )
+HB_FUNC( U2BIN )
 {
    char szString[ 4 ];
 

harbour/source/rtl/box.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_DISPBOX( void )
+HB_FUNC( DISPBOX )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISNUM( 4 ) )
    {

harbour/source/rtl/chrasc.c

@@ -40,7 +40,7 @@
 #include "hbapierr.h"
 
 /* converts an ASCII code to a character value */
-HARBOUR HB_CHR( void )
+HB_FUNC( CHR )
 {
    if( ISNUM( 1 ) )
    {
@@ -70,7 +70,7 @@ HARBOUR HB_CHR( void )
 }
 
 /* converts a character value to an ASCII code */
-HARBOUR HB_ASC( void )
+HB_FUNC( ASC )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 

harbour/source/rtl/colorind.c

@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_HB_COLORINDEX( void )
+HB_FUNC( HB_COLORINDEX )
 {
    if( ISCHAR( 1 ) && ISNUM( 2 ) )
    {

harbour/source/rtl/console.c

@@ -38,15 +38,15 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 David G. Holm <dholm@jsd-llc.com>
- *    hb_altout(), hb_devout(), HB_DEVOUT(), hb_devpos(),
- *    HB_DEVPOS(), hb_dispout(), HB___EJECT(), 
- *    hb_out(), hb_outerr(), HB_OUTERR(),
- *    hb_outstd(), HB_OUTSTD(), HB_PCOL(), HB_PROW(),
- *    HB_SETPRC(), and hb_consoleInitialize()
+ *    hb_altout(), hb_devout(), DEVOUT(), hb_devpos(),
+ *    DEVPOS(), hb_dispout(), __EJECT(), 
+ *    hb_out(), hb_outerr(), OUTERR(),
+ *    hb_outstd(), OUTSTD(), PCOL(), PROW(),
+ *    SETPRC(), and hb_consoleInitialize()
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
  *    hb_consoleGetNewLine()
- *    HB_DISPOUTAT()
+ *    DISPOUTAT()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -144,7 +144,7 @@ char * hb_consoleGetNewLine( void )
    return s_szCrLf;
 }
 
-HARBOUR HB_HB_OSNEWLINE( void )
+HB_FUNC( HB_OSNEWLINE )
 {
    hb_retc( s_szCrLf );
 }
@@ -315,13 +315,13 @@ void hb_devpos( SHORT row, SHORT col )
 
 /* NOTE: This should be placed after the hb_devpos() definition. */
 
-HARBOUR HB_DEVPOS( void ) /* Sets the screen and/or printer position */
+HB_FUNC( DEVPOS ) /* Sets the screen and/or printer position */
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_devpos( hb_parni( 1 ), hb_parni( 2 ) );
 }
 
-HARBOUR HB_OUTSTD( void ) /* writes a list of values to the standard output device */
+HB_FUNC( OUTSTD ) /* writes a list of values to the standard output device */
 {
    USHORT uiPCount = hb_pcount();
    USHORT uiParam;
@@ -334,7 +334,7 @@ HARBOUR HB_OUTSTD( void ) /* writes a list of values to the standard output devi
    }
 }
 
-HARBOUR HB_OUTERR( void ) /* writes a list of values to the standard error device */
+HB_FUNC( OUTERR ) /* writes a list of values to the standard error device */
 {
    USHORT uiPCount = hb_pcount();
    USHORT uiParam;
@@ -347,7 +347,7 @@ HARBOUR HB_OUTERR( void ) /* writes a list of values to the standard error devic
    }
 }
 
-HARBOUR HB_QQOUT( void ) /* writes a list of values to the current device (screen or printer) and is affected by SET ALTERNATE */
+HB_FUNC( QQOUT ) /* writes a list of values to the current device (screen or printer) and is affected by SET ALTERNATE */
 {
    USHORT uiPCount = hb_pcount();
    USHORT uiParam;
@@ -360,7 +360,7 @@ HARBOUR HB_QQOUT( void ) /* writes a list of values to the current device (scree
    }
 }
 
-HARBOUR HB_QOUT( void )
+HB_FUNC( QOUT )
 {
    hb_altout( s_szCrLf, CRLF_BUFFER_LEN - 1 );
 
@@ -377,10 +377,10 @@ HARBOUR HB_QOUT( void )
       hb_fsSetError( user_ferror ); /* Restore last user file error code */
    }
 
-   HB_QQOUT();
+   HB_FUNCNAME( QQOUT )();
 }
 
-HARBOUR HB_DEVOUT( void ) /* writes a single value to the current device (screen or printer), but is not affected by SET ALTERNATE */
+HB_FUNC( DEVOUT ) /* writes a single value to the current device (screen or printer), but is not affected by SET ALTERNATE */
 {
    if( hb_pcount() >= 1 )
    {
@@ -402,7 +402,7 @@ HARBOUR HB_DEVOUT( void ) /* writes a single value to the current device (screen
 
 /* TOFIX: CA-Cl*pper will print an eject even if SET DEVICE=SCREEN */
 
-HARBOUR HB___EJECT( void ) /* Ejects the current page from the printer */
+HB_FUNC( __EJECT ) /* Ejects the current page from the printer */
 {
    if( hb_stricmp( hb_set.HB_SET_DEVICE, "PRINTER" ) == 0 && hb_set.hb_set_printhan != FS_ERROR )
    {
@@ -414,17 +414,17 @@ HARBOUR HB___EJECT( void ) /* Ejects the current page from the printer */
    s_uiPRow = s_uiPCol = 0;
 }
 
-HARBOUR HB_PROW( void ) /* Returns the current printer row position */
+HB_FUNC( PROW ) /* Returns the current printer row position */
 {
    hb_retni( s_uiPRow );
 }
 
-HARBOUR HB_PCOL( void ) /* Returns the current printer row position */
+HB_FUNC( PCOL ) /* Returns the current printer row position */
 {
    hb_retni( s_uiPCol );
 }
 
-HARBOUR HB_SETPRC( void ) /* Sets the current printer row and column positions */
+HB_FUNC( SETPRC ) /* Sets the current printer row and column positions */
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
    {
@@ -433,7 +433,7 @@ HARBOUR HB_SETPRC( void ) /* Sets the current printer row and column positions *
    }
 }
 
-HARBOUR HB_DISPOUT( void ) /* writes a single value to the screen, but is not affected by SET ALTERNATE */
+HB_FUNC( DISPOUT ) /* writes a single value to the screen, but is not affected by SET ALTERNATE */
 {
    if( hb_pcount() >= 1 )
    {
@@ -455,7 +455,7 @@ HARBOUR HB_DISPOUT( void ) /* writes a single value to the screen, but is not af
 
 /* Undocumented Clipper function */
 
-HARBOUR HB_DISPOUTAT( void ) /* writes a single value to the screen at speficic position, but is not affected by SET ALTERNATE */
+HB_FUNC( DISPOUTAT ) /* writes a single value to the screen at speficic position, but is not affected by SET ALTERNATE */
 {
    if( hb_pcount() >= 3 )
    {

harbour/source/rtl/copyfile.c

@@ -116,7 +116,7 @@ static BOOL hb_fsCopy( char * szSource, char * szDest )
 
 /* Clipper returns .F. on failure and NIL on success */
 
-HARBOUR HB___COPYFILE( void )
+HB_FUNC( __COPYFILE )
 {
    if( ISCHAR( 1 ) && ISCHAR( 2 ) )
    {

harbour/source/rtl/datec.c

@@ -52,7 +52,7 @@ char * hb_cdow( int iDay )
    return ( iDay >= 1 && iDay <= 7 ) ? hb_daysname[ iDay - 1 ] : "";
 }
 
-HARBOUR HB_CMONTH( void )
+HB_FUNC( CMONTH )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
@@ -75,7 +75,7 @@ HARBOUR HB_CMONTH( void )
    }
 }
 
-HARBOUR HB_CDOW( void )
+HB_FUNC( CDOW )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 

harbour/source/rtl/dateshb.c

@@ -38,17 +38,17 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Jose Lalin <dezac@corevia.com>
- *    HB_DAY()
- *    HB_MONTH()
- *    HB_YEAR()
- *    HB_DOW()
+ *    DAY()
+ *    MONTH()
+ *    YEAR()
+ *    DOW()
  *
  * Copyright 1999 David G. Holm <dholm@jsd-llc.com>
- *    HB_CTOD()
- *    HB_DATE()
+ *    CTOD()
+ *    DATE()
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB_HB_STOD()
+ *    HB_STOD()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -73,7 +73,7 @@
    #include <dos.h>
 #endif
 
-HARBOUR HB_CTOD( void )
+HB_FUNC( CTOD )
 {
    if( ISCHAR( 1 ) )
    {
@@ -169,7 +169,7 @@ HARBOUR HB_CTOD( void )
    }
 }
 
-HARBOUR HB_DTOC( void )
+HB_FUNC( DTOC )
 {
    if( ISDATE( 1 ) )
    {
@@ -190,7 +190,7 @@ HARBOUR HB_DTOC( void )
    }
 }
 
-HARBOUR HB_DTOS( void )
+HB_FUNC( DTOS )
 {
    if( ISDATE( 1 ) )
    {
@@ -212,12 +212,12 @@ HARBOUR HB_DTOS( void )
 
 /* NOTE: Harbour extension, exactly the same as STOD(). */
 
-HARBOUR HB_HB_STOD( void )
+HB_FUNC( HB_STOD )
 {
    hb_retds( hb_parc( 1 ) );
 }
 
-HARBOUR HB_YEAR( void )
+HB_FUNC( YEAR )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
@@ -241,7 +241,7 @@ HARBOUR HB_YEAR( void )
    }
 }
 
-HARBOUR HB_MONTH( void )
+HB_FUNC( MONTH )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
@@ -265,7 +265,7 @@ HARBOUR HB_MONTH( void )
    }
 }
 
-HARBOUR HB_DAY( void )
+HB_FUNC( DAY )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
@@ -289,7 +289,7 @@ HARBOUR HB_DAY( void )
    }
 }
 
-HARBOUR HB_TIME( void )
+HB_FUNC( TIME )
 {
    char szResult[ 9 ];
 
@@ -309,7 +309,7 @@ HARBOUR HB_TIME( void )
    hb_retclen( szResult, 8 );
 }
 
-HARBOUR HB_DATE( void )
+HB_FUNC( DATE )
 {
    char szResult[ 9 ];
 
@@ -329,7 +329,7 @@ HARBOUR HB_DATE( void )
    hb_retds( szResult );
 }
 
-HARBOUR HB_DOW( void )
+HB_FUNC( DOW )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 

harbour/source/rtl/datesx.c

@@ -40,7 +40,7 @@
 /* NOTE: XBase++ compatible function */
 /* NOTE: XBase++ checks for the parameter count at compile time */
 
-HARBOUR HB_STOD( void )
+HB_FUNC( STOD )
 {
    hb_retds( hb_parc( 1 ) );
 }

harbour/source/rtl/defpath.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbset.h"
 
-HARBOUR HB_DEFPATH( void )
+HB_FUNC( DEFPATH )
 {
    char buffer[ _POSIX_PATH_MAX ];
    char delimiter[ 2 ] = ":";
@@ -70,8 +70,8 @@ HARBOUR HB_DEFPATH( void )
    hb_retc( buffer );
 }
 
-HARBOUR HB___DEFPATH( void )
+HB_FUNC( __DEFPATH )
 {
-   HB_DEFPATH();
+   HB_FUNCNAME( DEFPATH )();
 }
 

harbour/source/rtl/descend.c

@@ -49,7 +49,7 @@ void hb_strDescend( char * szStringTo, const char * szStringFrom, ULONG ulLen )
    }
 }
 
-HARBOUR HB_DESCEND( void )
+HB_FUNC( DESCEND )
 {
    PHB_ITEM pItem = hb_param( 1, IT_ANY );
 

harbour/source/rtl/dir.c

@@ -344,7 +344,7 @@ static BYTE * HarbourMaskToAttributes( USHORT usMask, BYTE * byAttrib )
 
 /* NOTE: The third (lEightDotThree) parameter is a Harbour extension. */
 
-HARBOUR HB_DIRECTORY( void )
+HB_FUNC( DIRECTORY )
 {
 #if defined(HAVE_POSIX_IO)
 

harbour/source/rtl/dirdrive.c

@@ -42,7 +42,7 @@
 
 /* NOTE: Clipper 5.3 only */
 
-HARBOUR HB_DIRCHANGE( void )
+HB_FUNC( DIRCHANGE )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -58,7 +58,7 @@ HARBOUR HB_DIRCHANGE( void )
 /* NOTE: Clipper 5.3 NG incorrectly states that the name if this function is
          DIRMAKE(), in reality it's not. */
 
-HARBOUR HB_MAKEDIR( void )
+HB_FUNC( MAKEDIR )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -72,7 +72,7 @@ HARBOUR HB_MAKEDIR( void )
 
 /* NOTE: Clipper 5.3 only */
 
-HARBOUR HB_DIRREMOVE( void )
+HB_FUNC( DIRREMOVE )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -86,7 +86,7 @@ HARBOUR HB_DIRREMOVE( void )
 
 /* NOTE: Clipper 5.3 undocumented */
 
-HARBOUR HB_ISDISK()
+HB_FUNC( ISDISK )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -97,7 +97,7 @@ HARBOUR HB_ISDISK()
    hb_fsSetError( uiErrorOld );
 }
 
-HARBOUR HB_DISKCHANGE( void )
+HB_FUNC( DISKCHANGE )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -108,7 +108,7 @@ HARBOUR HB_DISKCHANGE( void )
    hb_fsSetError( uiErrorOld );
 }
 
-HARBOUR HB_DISKNAME( void )
+HB_FUNC( DISKNAME )
 {
    USHORT uiErrorOld = hb_fsError();
    char szDrive[ 1 ];

harbour/source/rtl/do.c

@@ -38,7 +38,7 @@
 #include "hbapierr.h"
 #include "hbvm.h"
 
-HARBOUR HB_DO( void )
+HB_FUNC( DO )
 {
    PHB_ITEM pItem = hb_param( 1, IT_ANY );
 

harbour/source/rtl/empty.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_EMPTY( void )
+HB_FUNC( EMPTY )
 {
    PHB_ITEM pItem = hb_param( 1, IT_ANY );
 

harbour/source/rtl/environ.c

@@ -94,7 +94,7 @@
    #endif
 #endif
 
-HARBOUR HB_OS( void )
+HB_FUNC( OS )
 {
    char * cformat = "%s %d.%02d%c";
 
@@ -489,7 +489,7 @@ char * hb_version( USHORT uiMode )
    return pszVersion;
 }
 
-HARBOUR HB_VERSION( void )
+HB_FUNC( VERSION )
 {
    char * pszVersion = hb_version( hb_pcount() > 0 ? 1 : 0 );
    hb_retc( pszVersion );

harbour/source/rtl/errorapi.c

@@ -38,15 +38,15 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB___ERRINHANDLER()
- *    HB_DOSERROR()
+ *    DOSERROR()
+ *    __ERRINHANDLER()
+ *    __ERRRT_BASE()
  *    hb_errLaunch()
  *    hb_errLaunchSubst()
  *    hb_errGetFlags()
  *    hb_errPutFlags()
  *    hb_errRT_New()
  *    hb_errRT_New_Subst()
- *    HB___ERRRT_BASE()
  *    hb_errRT_BASE()
  *    hb_errRT_BASE_Ext1()
  *    hb_errRT_BASE_Subst()
@@ -73,7 +73,7 @@ static HB_ITEM s_errorBlock;
 static int     s_iLaunchCount = 0;
 static USHORT  s_uiErrorDOS = 0; /* The value of DOSERROR() */
 
-extern HARBOUR HB_ERRORNEW( void );
+extern HB_FUNC( ERRORNEW );
 
 /* NOTE: This is called via its symbol name, so we should make sure
          that it gets linked. WARNING ! DON'T make this function static. 
@@ -82,18 +82,18 @@ void hb_errForceLink()
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_errForceLink()"));
 
-   HB_ERRORNEW();
+   HB_FUNCNAME( ERRORNEW )();
 }
 
 /* There's a similar undocumented, internal functions in CA-Cl*pper named
    ErrorInHandler(). [vszakats] */
 
-HARBOUR HB___ERRINHANDLER( void )
+HB_FUNC( __ERRINHANDLER )
 {
    hb_errInternal( 9999, "Error recovery failure", NULL, NULL );
 }
 
-HARBOUR HB_ERRORBLOCK( void )
+HB_FUNC( ERRORBLOCK )
 {
    HB_ITEM oldError;
    PHB_ITEM pNewErrorBlock = hb_param( 1, IT_BLOCK );
@@ -124,7 +124,7 @@ HB_ERROR_INFO_PTR hb_errorHandler( HB_ERROR_INFO_PTR pNewHandler )
 
 /* TOFIX: Make it Clipper compatible. [vszakats] */
 
-HARBOUR HB_DOSERROR( void )
+HB_FUNC( DOSERROR )
 {
    hb_retni( s_uiErrorDOS );
 
@@ -697,7 +697,7 @@ PHB_ITEM hb_errRT_New_Subst(
    return( pError );
 }
 
-HARBOUR HB___ERRRT_BASE( void )
+HB_FUNC( __ERRRT_BASE )
 {
    hb_errRT_BASE( ( ULONG ) hb_parnl( 1 ),
                   ( ULONG ) hb_parnl( 2 ),

harbour/source/rtl/eval.c

@@ -38,7 +38,7 @@
 #include "hbapierr.h"
 #include "hbvm.h"
 
-HARBOUR HB_EVAL( void )
+HB_FUNC( EVAL )
 {
    PHB_ITEM pItem = hb_param( 1, IT_BLOCK );
 

harbour/source/rtl/fkmax.c

@@ -38,14 +38,14 @@
 
 /* Dumb function to maintain dBase III+ and CA-Cl*pper compatibility */
 
-HARBOUR HB_FKMAX( void )
+HB_FUNC( FKMAX )
 {
    hb_retni( 40 ); /* IBM specific */
 }
 
 /* Dumb function to maintain dBase III+ and CA-Cl*pper compatibility */
 
-HARBOUR HB_FKLABEL( void )
+HB_FUNC( FKLABEL )
 {
    PHB_ITEM pPar1 = hb_param( 1, IT_NUMERIC );
 

harbour/source/rtl/fnsplit.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapifs.h"
 
-HARBOUR HB_HB_FNAMESPLIT( void )
+HB_FUNC( HB_FNAMESPLIT )
 {
    if( ISCHAR( 1 ) )
    {
@@ -51,7 +51,7 @@ HARBOUR HB_HB_FNAMESPLIT( void )
    }
 }
 
-HARBOUR HB_HB_FNAMEMERGE( void )
+HB_FUNC( HB_FNAMEMERGE )
 {
    HB_FNAME pFileName;
    char szFileName[ _POSIX_PATH_MAX ];

harbour/source/rtl/fssize.c

@@ -80,7 +80,7 @@ ULONG hb_fsFSize( BYTE * pszFileName, BOOL bUseDirEntry )
    return 0;
 }
 
-HARBOUR HB_HB_FSIZE( void )
+HB_FUNC( HB_FSIZE )
 {
    hb_retnl( ISCHAR( 1 ) ? hb_fsFSize( ( BYTE * ) hb_parc( 1 ), 
                                        ISLOG( 2 ) ? hb_parl( 2 ) : TRUE ) : 0 );

harbour/source/rtl/fstemp.c

@@ -70,7 +70,7 @@ FHANDLE hb_fsCreateTemp( const BYTE * pszDir, const BYTE * pszPrefix, USHORT uiA
    return FS_ERROR;
 }
 
-HARBOUR HB_HB_FTEMPNAME()
+HB_FUNC( HB_FTEMPNAME )
 {
    BYTE szName[ _POSIX_PATH_MAX + 1 ];
 
@@ -79,7 +79,7 @@ HARBOUR HB_HB_FTEMPNAME()
    hb_retc( ( char * ) szName );
 }
 
-HARBOUR HB_HB_FTEMPCREATE( void )
+HB_FUNC( HB_FTEMPCREATE )
 {
    hb_retni( hb_fsCreateTemp( ( BYTE * ) hb_parc( 1 ),
                               ( BYTE * ) hb_parc( 2 ),

harbour/source/rtl/gete.c

@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB_GETE()
+ *    GETE()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -51,7 +51,7 @@
          function will return an empty string if called with more than one
          parameter. [vszakats] */
 
-HARBOUR HB_GETENV( void )
+HB_FUNC( GETENV )
 {
    PHB_ITEM pName = hb_param( 1, IT_STRING );
 
@@ -98,8 +98,8 @@ HARBOUR HB_GETENV( void )
 
 /* NOTE: Undocumented Clipper function. [vszakats] */
 
-HARBOUR HB_GETE( void )
+HB_FUNC( GETE )
 {
-   HB_GETENV();
+   HB_FUNCNAME( GETENV )();
 }
 

harbour/source/rtl/gt.c

@@ -36,17 +36,17 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_DISPBEGIN( void )
+HB_FUNC( DISPBEGIN )
 {
    hb_gtDispBegin();
 }
 
-HARBOUR HB_DISPEND( void )
+HB_FUNC( DISPEND )
 {
    hb_gtDispEnd();
 }
 
-HARBOUR HB_DISPCOUNT( void )
+HB_FUNC( DISPCOUNT )
 {
    hb_retni( hb_gtDispCount() );
 }

harbour/source/rtl/gx.c

@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 {list of individual authors and e-mail addresses}
- *    HB_SETMODE()
+ *    SETMODE()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -47,18 +47,18 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_ISCOLOR( void )
+HB_FUNC( ISCOLOR )
 {
    hb_retl( hb_gtIsColor() );
 }
 
-HARBOUR HB_NOSNOW( void )
+HB_FUNC( NOSNOW )
 {
    if( ISLOG( 1 ) )
       hb_gtSetSnowFlag( hb_parl( 1 ) );
 }
 
-HARBOUR HB_SETMODE( void )
+HB_FUNC( SETMODE )
 {
    hb_retl( hb_gtSetMode( ISNUM( 1 ) ? hb_parni( 1 ) : ( hb_gtMaxRow() + 1 ),
                           ISNUM( 2 ) ? hb_parni( 2 ) : ( hb_gtMaxCol() + 1 ) ) == 0 );

harbour/source/rtl/hardcr.c

@@ -59,7 +59,7 @@ char * hb_strHardCR( char * pszString, ULONG ulStringLen )
    return pszString;
 }
 
-HARBOUR HB_HARDCR( void )
+HB_FUNC( HARDCR )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
 

harbour/source/rtl/inkey.c

@@ -72,7 +72,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB_HB_KEYPUT()
+ *    HB_KEYPUT()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -321,7 +321,7 @@ void hb_inkeyReset( BOOL allocate )     /* Reset the keyboard buffer */
    }
 }
 
-HARBOUR HB_INKEY( void )
+HB_FUNC( INKEY )
 {
    int args = hb_pcount();
    int key = 0;
@@ -357,7 +357,7 @@ HARBOUR HB_INKEY( void )
    hb_retni( key );
 }
 
-HARBOUR HB___KEYBOARD( void )
+HB_FUNC( __KEYBOARD )
 {
    /* Clear the typeahead buffer without reallocating the keyboard buffer */
    hb_inkeyReset( FALSE );
@@ -410,18 +410,18 @@ void hb_inkeyPut( int ch )
    }
 }
 
-HARBOUR HB_HB_KEYPUT( void )
+HB_FUNC( HB_KEYPUT )
 {
    if( ISNUM( 1 ) )
       hb_inkeyPut( hb_parni( 1 ) );
 }
 
-HARBOUR HB_NEXTKEY( void )
+HB_FUNC( NEXTKEY )
 {
    hb_retni( hb_inkeyNext() );
 }
 
-HARBOUR HB_LASTKEY( void )
+HB_FUNC( LASTKEY )
 {
    hb_retni( s_inkeyLast );
 }

harbour/source/rtl/is.c

@@ -41,7 +41,7 @@
 /* TEST: QOUT( "isalpha( 'hello' ) = ", isalpha( 'hello' ) ) */
 /* TEST: QOUT( "isalpha( '12345' ) = ", isalpha( '12345' ) ) */
 
-HARBOUR HB_ISALPHA( void )
+HB_FUNC( ISALPHA )
 {
    hb_retl( isalpha( *hb_parc( 1 ) ) );
 }
@@ -50,7 +50,7 @@ HARBOUR HB_ISALPHA( void )
 /* TEST: QOUT( "isdigit( '12345' ) = ", isdigit( '12345' ) ) */
 /* TEST: QOUT( "isdigit( 'abcde' ) = ", isdigit( 'abcde' ) ) */
 
-HARBOUR HB_ISDIGIT( void )
+HB_FUNC( ISDIGIT )
 {
    hb_retl( isdigit( *hb_parc( 1 ) ) );
 }
@@ -59,7 +59,7 @@ HARBOUR HB_ISDIGIT( void )
 /* TEST: QOUT( "isupper( 'Abcde' ) = ", isupper( 'Abcde' ) ) */
 /* TEST: QOUT( "isupper( 'abcde' ) = ", isupper( 'abcde' ) ) */
 
-HARBOUR HB_ISUPPER( void )
+HB_FUNC( ISUPPER )
 {
    hb_retl( isupper( *hb_parc( 1 ) ) );
 }
@@ -68,7 +68,7 @@ HARBOUR HB_ISUPPER( void )
 /* TEST: QOUT( "islower( 'abcde' ) = ", islower( 'abcde' ) ) */
 /* TEST: QOUT( "islower( 'Abcde' ) = ", islower( 'Abcde' ) ) */
 
-HARBOUR HB_ISLOWER( void )
+HB_FUNC( ISLOWER )
 {
    hb_retl( islower( *hb_parc( 1 ) ) );
 }

harbour/source/rtl/isprint.c

@@ -66,7 +66,7 @@
 /* NOTE: The parameter is an extension over CA-Cl*pper, it's also supported
          by XBase++. [vszakats] */
 
-HARBOUR HB_ISPRINTER( void )
+HB_FUNC( ISPRINTER )
 {
    char * pszDOSPort = ( ISCHAR( 1 ) && hb_parclen( 1 ) >= 4 ) ? hb_parc( 1 ) : "LPT1";
    USHORT uiPort = atoi( pszDOSPort + 3 );

harbour/source/rtl/left.c

@@ -39,7 +39,7 @@
 
 /* returns the left-most n characters in string */
 
-HARBOUR HB_LEFT( void )
+HB_FUNC( LEFT )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 

harbour/source/rtl/len.c

@@ -37,7 +37,7 @@
 #include "hbapierr.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_LEN( void )
+HB_FUNC( LEN )
 {
    PHB_ITEM pItem = hb_param( 1, IT_ANY );
 

harbour/source/rtl/lennum.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_LENNUM( void )
+HB_FUNC( LENNUM )
 {
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );
    ULONG ulLen = 0;

harbour/source/rtl/math.c

@@ -97,7 +97,7 @@ int matherr( struct exception * err )
 }
 #endif
 
-HARBOUR HB_EXP( void )
+HB_FUNC( EXP )
 {
    if( ISNUM( 1 ) )
    {
@@ -134,7 +134,7 @@ HARBOUR HB_EXP( void )
    }
 }
 
-HARBOUR HB_LOG( void )
+HB_FUNC( LOG )
 {
    if( ISNUM( 1 ) )
    {
@@ -177,7 +177,7 @@ HARBOUR HB_LOG( void )
    }
 }
 
-HARBOUR HB_SQRT( void )
+HB_FUNC( SQRT )
 {
    if( ISNUM( 1 ) )
    {

harbour/source/rtl/maxrow.c

@@ -36,12 +36,12 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_MAXROW( void ) /* Return the maximum screen row number (zero origin) */
+HB_FUNC( MAXROW ) /* Return the maximum screen row number (zero origin) */
 {
    hb_retni( hb_gtMaxRow() );
 }
 
-HARBOUR HB_MAXCOL( void ) /* Return the maximum screen column number (zero origin) */
+HB_FUNC( MAXCOL ) /* Return the maximum screen column number (zero origin) */
 {
    hb_retni( hb_gtMaxCol() );
 }

harbour/source/rtl/memofile.c

@@ -41,7 +41,7 @@
          this limit is extended, so we are not *stricly* compatible here. 
          [vszakats] */
 
-HARBOUR HB_MEMOREAD( void )
+HB_FUNC( MEMOREAD )
 {
    PHB_ITEM pFileName = hb_param( 1, IT_STRING );
 
@@ -83,7 +83,7 @@ HARBOUR HB_MEMOREAD( void )
       hb_retc( "" );
 }
 
-HARBOUR HB_MEMOWRIT( void )
+HB_FUNC( MEMOWRIT )
 {
    PHB_ITEM pFileName = hb_param( 1, IT_STRING );
    PHB_ITEM pString = hb_param( 2, IT_STRING );

harbour/source/rtl/memoline.c

@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_MEMOLINE( void )
+HB_FUNC( MEMOLINE )
 {
    char * pszString    = ISCHAR( 1 ) ? hb_parc( 1 ) : "";
    ULONG  ulLineLength = ISNUM( 2 ) ? hb_parni( 2 ) : 79;

harbour/source/rtl/minmax.c

@@ -38,7 +38,7 @@
 #include "hbapierr.h"
 
 /* returns the maximum of two date or numerics */
-HARBOUR HB_MAX( void )
+HB_FUNC( MAX )
 {
    PHB_ITEM p1 = hb_param( 1, IT_ANY );
    PHB_ITEM p2 = hb_param( 2, IT_ANY );
@@ -98,7 +98,7 @@ HARBOUR HB_MAX( void )
 }
 
 /* returns the minimum of two date or numerics */
-HARBOUR HB_MIN( void )
+HB_FUNC( MIN )
 {
    PHB_ITEM p1 = hb_param( 1, IT_ANY );
    PHB_ITEM p2 = hb_param( 2, IT_ANY );

harbour/source/rtl/mlcount.c

@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_MLCOUNT( void )
+HB_FUNC( MLCOUNT )
 {
    char * pszString    = ISCHAR( 1 ) ? hb_parc( 1 ) : "";
    ULONG  ulLineLength = ISNUM( 2 ) ? hb_parni( 2 ) : 79;

harbour/source/rtl/mlpos.c

@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_MLPOS( void )
+HB_FUNC( MLPOS )
 {
    char * pszString    = ISCHAR( 1 ) ? hb_parc( 1 ) : "";
    ULONG  ulLineLength = hb_parni( 2 );

harbour/source/rtl/mod.c

@@ -47,7 +47,7 @@
 /* NOTE: This C version fully emulates the behaviour of the original
          CA-Cl*pper version, including bugs/side-effects. [vszakats] */
 
-HARBOUR HB_MOD( void )
+HB_FUNC( MOD )
 {
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );
 

harbour/source/rtl/mouseapi.c

@@ -161,22 +161,22 @@ void hb_mouseGetBounds( int * piTop, int * piLeft, int * piBottom, int * piRight
 
 #ifdef HB_COMPAT_C53
 
-HARBOUR HB_MPRESENT( void )
+HB_FUNC( MPRESENT )
 {
    hb_retl( hb_mouseIsPresent() );
 }
 
-HARBOUR HB_MHIDE( void )
+HB_FUNC( MHIDE )
 {
    hb_mouseSetCursor( FALSE );
 }
 
-HARBOUR HB_MSHOW( void )
+HB_FUNC( MSHOW )
 {
    hb_mouseSetCursor( TRUE );
 }
 
-HARBOUR HB_MSETCURSOR( void )
+HB_FUNC( MSETCURSOR )
 {
    hb_retl( hb_mouseGetCursor() );
 
@@ -184,33 +184,33 @@ HARBOUR HB_MSETCURSOR( void )
       hb_mouseSetCursor( hb_parl( 1 ) );
 }
 
-HARBOUR HB_MROW( void )
+HB_FUNC( MROW )
 {
    hb_retni( hb_mouseRow() );   
 }
 
-HARBOUR HB_MCOL( void )
+HB_FUNC( MCOL )
 {
    hb_retni( hb_mouseCol() );   
 }
 
-HARBOUR HB_MSETPOS( void )
+HB_FUNC( MSETPOS )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_mouseSetPos( hb_parni( 1 ), hb_parni( 2 ) );
 }
 
-HARBOUR HB_MRIGHTDOWN( void )
+HB_FUNC( MRIGHTDOWN )
 {
    hb_retl( hb_mouseIsButtonPressed( s_iRightButton ) );
 }
 
-HARBOUR HB_MLEFTDOWN( void )
+HB_FUNC( MLEFTDOWN )
 {
    hb_retl( hb_mouseIsButtonPressed( s_iLeftButton ) );
 }
 
-HARBOUR HB_MDBLCLK( void )
+HB_FUNC( MDBLCLK )
 {
    hb_retni( s_uiDoubleClickSpeed );
 
@@ -223,7 +223,7 @@ HARBOUR HB_MDBLCLK( void )
    }
 }
 
-HARBOUR HB_MSAVESTATE( void )
+HB_FUNC( MSAVESTATE )
 {
    int iTop, iLeft, iBottom, iRight;
 
@@ -260,7 +260,7 @@ HARBOUR HB_MSAVESTATE( void )
    hb_xfree( pBuffer );
 }
 
-HARBOUR HB_MRESTSTATE( void )
+HB_FUNC( MRESTSTATE )
 {
    USHORT uiLen = sizeof( int ) + 
                   sizeof( int ) + 
@@ -301,7 +301,7 @@ HARBOUR HB_MRESTSTATE( void )
    }
 }
 
-HARBOUR HB_MSETBOUNDS( void )
+HB_FUNC( MSETBOUNDS )
 {
    int iTop    = ISNUM( 1 ) ? hb_parni( 1 ) : 0;
    int iLeft   = ISNUM( 2 ) ? hb_parni( 2 ) : 0; 
@@ -313,34 +313,3 @@ HARBOUR HB_MSETBOUNDS( void )
 
 #endif
 
-#ifdef HB_COMPAT_XPP
-
-/* NOTE: XBase++ compatible function */
-
-HARBOUR HB_NUMBUTTONS( void )
-{
-   hb_retni( hb_mouseCountButton() );
-}
-
-/* NOTE: XBase++ compatible function */
-
-HARBOUR HB_SETMOUSE( void )
-{
-   hb_retl( hb_mouseGetCursor() );
-
-   if( ISLOG( 1 ) )
-      hb_mouseSetCursor( hb_parl( 1 ) );
-
-   {
-      PHB_ITEM pRow = hb_param( 2, IT_NUMERIC );
-      PHB_ITEM pCol = hb_param( 3, IT_NUMERIC );
-
-      if( pRow || pCol )
-      {
-         hb_mouseSetPos( pRow ? hb_itemGetNI( pRow ) : hb_mouseRow() ,
-                         pCol ? hb_itemGetNI( pCol ) : hb_mouseCol() );
-      }
-   }
-}
-
-#endif

harbour/source/rtl/mousex.c

@@ -0,0 +1,68 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * NUMBUTTONS(), SETMOUSE() XBase++ compatible functions.
+ *
+ * Copyright 1999 Victor Szakats <info@szelvesz.hu>
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version, with one exception:
+ *
+ * The exception is that if you link the Harbour Runtime Library (HRL)
+ * and/or the Harbour Virtual Machine (HVM) with other files to produce
+ * an executable, this does not by itself cause the resulting executable
+ * to be covered by the GNU General Public License. Your use of that
+ * executable is in no way restricted on account of linking the HRL
+ * and/or HVM code into it.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
+ * their web site at http://www.gnu.org/).
+ *
+ */
+
+#include "hbapi.h"
+#include "hbapiitm.h"
+#include "hbapigt.h"
+
+/* NOTE: XBase++ compatible functions */
+
+#ifdef HB_COMPAT_XPP
+
+HB_FUNC( NUMBUTTONS )
+{
+   hb_retni( hb_mouseCountButton() );
+}
+
+HB_FUNC( SETMOUSE )
+{
+   hb_retl( hb_mouseGetCursor() );
+
+   if( ISLOG( 1 ) )
+      hb_mouseSetCursor( hb_parl( 1 ) );
+
+   {
+      PHB_ITEM pRow = hb_param( 2, IT_NUMERIC );
+      PHB_ITEM pCol = hb_param( 3, IT_NUMERIC );
+
+      if( pRow || pCol )
+      {
+         hb_mouseSetPos( pRow ? hb_itemGetNI( pRow ) : hb_mouseRow() ,
+                         pCol ? hb_itemGetNI( pCol ) : hb_mouseCol() );
+      }
+   }
+}
+
+#endif

harbour/source/rtl/mtran.c

@@ -77,7 +77,7 @@ char * hb_strMemotran( char * pszResult, ULONG * ulResultLen, const char * pszSt
    return pszResult;
 }
 
-HARBOUR HB_MEMOTRAN( void )
+HB_FUNC( MEMOTRAN )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
 

harbour/source/rtl/natmsg.c

@@ -38,8 +38,8 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB__NATSORTVER()
- *    HB__NATMSGVER()
+ *    _NATSORTVER()
+ *    _NATMSGVER()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -93,21 +93,21 @@ char * hb_nationGetMsg( USHORT uiMsg )
    return ( uiMsg >= 1 && uiMsg <= ( sizeof( s_szMessages ) / sizeof( char * ) ) ) ? s_szMessages[ uiMsg - 1 ] : "";
 }
 
-HARBOUR HB_ISAFFIRM( void )
+HB_FUNC( ISAFFIRM )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
    hb_retl( pItem && hb_itemGetCLen( pItem ) >= 1 && toupper( hb_itemGetCPtr( pItem )[ 0 ] ) == s_szMessages[ _LF_YN - 1 ][ 0 ] );
 }
 
-HARBOUR HB_ISNEGATIVE( void )
+HB_FUNC( ISNEGATIVE )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
    hb_retl( pItem && hb_itemGetCLen( pItem ) >= 1 && toupper( hb_itemGetCPtr( pItem )[ 0 ] ) == s_szMessages[ _LF_YN - 1 ][ 2 ] );
 }
 
-HARBOUR HB_NATIONMSG( void )
+HB_FUNC( NATIONMSG )
 {
    if( hb_pcount() == 0 )
       /* TODO: Replace this with Language API call. */
@@ -121,7 +121,7 @@ HARBOUR HB_NATIONMSG( void )
 /* NOTE: Intentionally using one leading underscore, like in Clipper. 
          [vszakats] */
 
-HARBOUR HB__NATSORTVER( void )
+HB_FUNC( _NATSORTVER )
 {
    /* NOTE: CA-Cl*pper 5.2e Intl. will return: "NATSORT v1.2i x14 19/Mar/93" */
    /* NOTE: CA-Cl*pper 5.3  Intl. will return: "NATSORT v1.3i x19 06/Mar/95" */
@@ -132,7 +132,7 @@ HARBOUR HB__NATSORTVER( void )
 /* NOTE: Intentionally using one leading underscore, like in Clipper. 
          [vszakats] */
 
-HARBOUR HB__NATMSGVER( void )
+HB_FUNC( _NATMSGVER )
 {
    /* NOTE: CA-Cl*pper 5.2e Intl. will return: "NATMSGS v1.2i x14 19/Mar/93" */
    /* NOTE: CA-Cl*pper 5.3  Intl. will return: "NATMSGS v1.3i x19 06/Mar/95" */

harbour/source/rtl/net.c

@@ -55,7 +55,7 @@
                       AX         Error code, if CF is set
 */
 
-HARBOUR HB_NETNAME( void )
+HB_FUNC( NETNAME )
 {
 #if defined(HB_OS_WIN_32)
    {

harbour/source/rtl/oemansi.c

@@ -41,7 +41,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_HB_ANSITOOEM( void )
+HB_FUNC( HB_ANSITOOEM )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
 
@@ -63,7 +63,7 @@ HARBOUR HB_HB_ANSITOOEM( void )
       hb_retc( "" );
 }
            
-HARBOUR HB_HB_OEMTOANSI( void )
+HB_FUNC( HB_OEMTOANSI )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
 
@@ -89,16 +89,16 @@ HARBOUR HB_HB_OEMTOANSI( void )
 
 /* NOTE: XBase++ compatible function */
 
-HARBOUR HB_CONVTOOEMCP( void )
+HB_FUNC( CONVTOOEMCP )
 {
-   HB_HB_ANSITOOEM();
+   HB_FUNCNAME( HB_ANSITOOEM )();
 }
 
 /* NOTE: XBase++ compatible function */
 
-HARBOUR HB_CONVTOANSICP( void )
+HB_FUNC( CONVTOANSICP )
 {
-   HB_HB_OEMTOANSI();
+   HB_FUNCNAME( HB_OEMTOANSI )();
 }
 
 #endif

harbour/source/rtl/oldbox.c

@@ -35,20 +35,20 @@
 
 #include "hbapigt.h"
 
-HARBOUR HB___BOX( void )
+HB_FUNC( __BOX )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISNUM( 4 ) )
       hb_gtBox( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ),
                 ( BYTE * ) ( ISCHAR( 5 ) ? hb_parc( 5 ) : " " ) );
 }
 
-HARBOUR HB___BOXD( void )
+HB_FUNC( __BOXD )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISNUM( 4 ) )
       hb_gtBoxD( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) );
 }
 
-HARBOUR HB___BOXS( void )
+HB_FUNC( __BOXS )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISNUM( 4 ) )
       hb_gtBoxS( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) );

harbour/source/rtl/oldclear.c

@@ -35,7 +35,7 @@
 
 #include "hbapigt.h"
 
-HARBOUR HB___ATCLEAR( void )
+HB_FUNC( __ATCLEAR )
 {
    if( hb_pcount() == 4 )
    {
@@ -44,7 +44,7 @@ HARBOUR HB___ATCLEAR( void )
    }
 }
 
-HARBOUR HB___CLEAR( void )
+HB_FUNC( __CLEAR )
 {
    hb_gtScroll( 0, 0, hb_gtMaxRow(), hb_gtMaxCol(), 0, 0 );
    hb_gtSetPos( 0, 0 );

harbour/source/rtl/pad.c

@@ -95,7 +95,7 @@ static char * hb_itemPadConv( PHB_ITEM pItem, char * buffer, ULONG * pulSize )
 
 /* right-pads a date, number, or string with spaces or supplied character */
 /* TEST: QOUT( "padr( 'hello', 10 ) = '" + padr( 'hello', 10 ) + "'" ) */
-HARBOUR HB_PADR( void )
+HB_FUNC( PADR )
 {
    ULONG ulSize;
    char buffer[ 128 ];
@@ -134,14 +134,14 @@ HARBOUR HB_PADR( void )
 }
 
 /* synonymn for PADR */
-HARBOUR HB_PAD( void )
+HB_FUNC( PAD )
 {
-   HB_PADR();
+   HB_FUNCNAME( PADR )();
 }
 
 /* left-pads a date, number, or string with spaces or supplied character */
 /* TEST: QOUT( "padl( 'hello', 10 ) = '" + padl( 'hello', 10 ) + "'" ) */
-HARBOUR HB_PADL( void )
+HB_FUNC( PADL )
 {
    ULONG ulSize;
    char buffer[ 128 ];
@@ -183,7 +183,7 @@ HARBOUR HB_PADL( void )
 
 /* centre-pads a date, number, or string with spaces or supplied character */
 /* TEST: QOUT( "padc( 'hello', 10 ) = '" + padc( 'hello', 10 ) + "'" ) */
-HARBOUR HB_PADC( void )
+HB_FUNC( PADC )
 {
    ULONG ulSize;
    char buffer[ 128 ];
@@ -225,3 +225,4 @@ HARBOUR HB_PADC( void )
    else
       hb_retc( "" );
 }
+

harbour/source/rtl/philes.c

@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB_CURDIR()
+ *    CURDIR()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -50,7 +50,7 @@
 #include "hbapifs.h"
 #include "hbapierr.h"
 
-HARBOUR HB_FOPEN( void )
+HB_FUNC( FOPEN )
 {
    if( ISCHAR( 1 ) )
       hb_retni( hb_fsOpen( ( BYTE * ) hb_parc( 1 ),
@@ -59,7 +59,7 @@ HARBOUR HB_FOPEN( void )
       hb_errRT_BASE( EG_ARG, 2021, NULL, "FOPEN" ); /* NOTE: Undocumented but existing Clipper Run-time error */
 }
 
-HARBOUR HB_FCREATE( void )
+HB_FUNC( FCREATE )
 {
    if( ISCHAR( 1 ) )
       hb_retni( hb_fsCreate( ( BYTE * ) hb_parc( 1 ),
@@ -68,7 +68,7 @@ HARBOUR HB_FCREATE( void )
       hb_retni( FS_ERROR );
 }
 
-HARBOUR HB_FREAD( void )
+HB_FUNC( FREAD )
 {
    ULONG ulRead;
 
@@ -96,7 +96,7 @@ HARBOUR HB_FREAD( void )
    hb_retnl( ulRead );
 }
 
-HARBOUR HB_FWRITE( void )
+HB_FUNC( FWRITE )
 {
    if( ISNUM( 1 ) && ISCHAR( 2 ) )
       hb_retnl( hb_fsWriteLarge( hb_parni( 1 ),
@@ -106,12 +106,12 @@ HARBOUR HB_FWRITE( void )
       hb_retnl( 0 );
 }
 
-HARBOUR HB_FERROR( void )
+HB_FUNC( FERROR )
 {
    hb_retni( hb_fsError() );
 }
 
-HARBOUR HB_FCLOSE( void )
+HB_FUNC( FCLOSE )
 {
    hb_fsSetError( 0 );
 
@@ -124,7 +124,7 @@ HARBOUR HB_FCLOSE( void )
       hb_retl( FALSE );
 }
 
-HARBOUR HB_FERASE( void )
+HB_FUNC( FERASE )
 {
    hb_fsSetError( 3 );
 
@@ -134,7 +134,7 @@ HARBOUR HB_FERASE( void )
       hb_retni( -1 );
 }
 
-HARBOUR HB_FRENAME( void )
+HB_FUNC( FRENAME )
 {
    hb_fsSetError( 2 );
 
@@ -144,7 +144,7 @@ HARBOUR HB_FRENAME( void )
       hb_retni( -1 );
 }
 
-HARBOUR HB_FSEEK( void )
+HB_FUNC( FSEEK )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_retnl( hb_fsSeek( hb_parni( 1 ),
@@ -154,12 +154,12 @@ HARBOUR HB_FSEEK( void )
       hb_retnl( 0 );
 }
 
-HARBOUR HB_FILE( void )
+HB_FUNC( FILE )
 {
    hb_retl( ISCHAR( 1 ) ? hb_fsFile( ( BYTE * ) hb_parc( 1 ) ) : FALSE );
 }
 
-HARBOUR HB_FREADSTR( void )
+HB_FUNC( FREADSTR )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
    {
@@ -190,7 +190,7 @@ HARBOUR HB_FREADSTR( void )
 /* NOTE: This function should not return the leading and trailing */
 /*       (back)slashes. [vszakats] */
 
-HARBOUR HB_CURDIR( void )
+HB_FUNC( CURDIR )
 {
    USHORT uiErrorOld = hb_fsError();
    BYTE * pbyBuffer = ( BYTE * ) hb_xgrab( _POSIX_PATH_MAX + 1 );

harbour/source/rtl/philes53.c

@@ -40,7 +40,7 @@
 
 /* NOTE: Clipper 5.3 undocumented */
 
-HARBOUR HB_FSETDEVMOD( void )
+HB_FUNC( FSETDEVMOD )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_fsSetDevMode( hb_parni( 1 ), hb_parni( 2 ) );

harbour/source/rtl/philesx.c

@@ -42,7 +42,7 @@
 
 /* NOTE: XBase++ compatible */
 
-HARBOUR HB_CURDRIVE( void )
+HB_FUNC( CURDRIVE )
 {
    USHORT uiErrorOld = hb_fsError();
    char szDrive[ 1 ];

harbour/source/rtl/rat.c

@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_RAT( void )
+HB_FUNC( RAT )
 {
    ULONG ulSubLen = hb_parclen( 1 );
 

harbour/source/rtl/replic.c

@@ -39,7 +39,7 @@
 
 /* returns n copies of given string */
 /* TEST: QOUT( "replicate( 'abc', 5 ) = " + replicate( 'abc', 5 ) ) */
-HARBOUR HB_REPLICATE( void )
+HB_FUNC( REPLICATE )
 {
    if( ISCHAR( 1 ) && ISNUM( 2 ) )
    {

harbour/source/rtl/right.c

@@ -39,7 +39,7 @@
 
 /* returns the right-most n characters in string */
 
-HARBOUR HB_RIGHT( void )
+HB_FUNC( RIGHT )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 

harbour/source/rtl/round.c

@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 David G. Holm <dholm@jsd-llc.com>
- *    HB_ROUND()
+ *    ROUND()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -50,7 +50,7 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 
-HARBOUR HB_INT( void )
+HB_FUNC( INT )
 {
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );
 
@@ -115,7 +115,7 @@ double hb_numRound( double dResult, int iDec )
    return dResult;
 }
 
-HARBOUR HB_ROUND( void )
+HB_FUNC( ROUND )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
    {

harbour/source/rtl/run.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapierr.h"
 
-HARBOUR HB___RUN( void )
+HB_FUNC( __RUN )
 {
 #if defined(__TURBOC__) || defined(__BORLANDC__)  || defined(_MSC_VER) || defined(__IBMCPP__) || defined(__GNUC__)
    if( ISCHAR( 1 ) )

harbour/source/rtl/samples.c

@@ -80,12 +80,12 @@ static ULONG hb_TimeStrToSec( char * pszTime )
    return ulTime;
 }
 
-HARBOUR HB_DAYS( void )
+HB_FUNC( DAYS )
 {
    hb_retnl( hb_parnl( 1 ) / 86400 );
 }
 
-HARBOUR HB_ELAPTIME( void )
+HB_FUNC( ELAPTIME )
 {
    ULONG ulStart = hb_TimeStrToSec( hb_parc( 1 ) );
    ULONG ulEnd = hb_TimeStrToSec( hb_parc( 2 ) );
@@ -94,12 +94,12 @@ HARBOUR HB_ELAPTIME( void )
    hb_retc( hb_SecToTimeStr( szTime, ( ulEnd < ulStart ? 86400 : 0 ) + ulEnd - ulStart ) );
 }
 
-HARBOUR HB_SECS( void )
+HB_FUNC( SECS )
 {
    hb_retnl( hb_TimeStrToSec( hb_parc( 1 ) ) );
 }
 
-HARBOUR HB_TSTRING( void )
+HB_FUNC( TSTRING )
 {
    char szTime[ 9 ];
 

harbour/source/rtl/saverest.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_SAVESCREEN( void )
+HB_FUNC( SAVESCREEN )
 {
    USHORT uiTop    = ISNUM( 1 ) ? hb_parni( 1 ) : 0;      
    USHORT uiLeft   = ISNUM( 2 ) ? hb_parni( 2 ) : 0;      
@@ -55,7 +55,7 @@ HARBOUR HB_SAVESCREEN( void )
    hb_xfree( ( char * ) pBuffer );
 }
 
-HARBOUR HB_RESTSCREEN( void )
+HB_FUNC( RESTSCREEN )
 {
    if( ISCHAR( 5 ) )
       hb_gtRest( ISNUM( 1 ) ? hb_parni( 1 ) : 0,            

harbour/source/rtl/scroll.c

@@ -38,7 +38,7 @@
 
 /* Scrolls a screen region */
 
-HARBOUR HB_SCROLL( void )
+HB_FUNC( SCROLL )
 {
    int iMaxRow = hb_gtMaxRow();
    int iMaxCol = hb_gtMaxCol();

harbour/source/rtl/seconds.c

@@ -62,7 +62,7 @@ double hb_secondsToday( void )
           ( ( double ) tb.millitm / 1000 );
 }
 
-HARBOUR HB_SECONDS( void )
+HB_FUNC( SECONDS )
 {
    hb_retnd( hb_secondsToday() );
 }

harbour/source/rtl/set.c

@@ -373,7 +373,7 @@ static FHANDLE open_handle( char * file_name, BOOL bAppend, char * def_ext, HB_s
    return handle;
 }
 
-HARBOUR HB_SETCANCEL( void )
+HB_FUNC( SETCANCEL )
 {
    hb_retl( hb_set.HB_SET_CANCEL );
 
@@ -381,7 +381,7 @@ HARBOUR HB_SETCANCEL( void )
       hb_set.HB_SET_CANCEL = hb_parl( 1 );
 }
 
-HARBOUR HB___SETCENTURY( void )
+HB_FUNC( __SETCENTURY )
 {
    BOOL old_century_setting = hb_set.hb_set_century;
 
@@ -463,7 +463,7 @@ HARBOUR HB___SETCENTURY( void )
    hb_retl( old_century_setting );
 }
 
-HARBOUR HB_SET( void )
+HB_FUNC( SET )
 {
    BOOL bFlag;
    int args = hb_pcount();

harbour/source/rtl/setcolor.c

@@ -49,18 +49,18 @@ char * hb_setColor( char * szColor )
    return hb_set.HB_SET_COLOR;
 }
 
-HARBOUR HB_SETCOLOR( void )
+HB_FUNC( SETCOLOR )
 {
    hb_retc( hb_setColor( ISCHAR( 1 ) ? hb_parc( 1 ) : NULL ) );
 }
 
-HARBOUR HB_COLORSELECT( void )
+HB_FUNC( COLORSELECT )
 {
    if( ISNUM( 1 ) )
       hb_gtColorSelect( hb_parni( 1 ) );
 }
 
-HARBOUR HB_SETBLINK( void )
+HB_FUNC( SETBLINK )
 {
    BOOL bPreviousBlink;
 

harbour/source/rtl/setcurs.c

@@ -49,7 +49,7 @@ USHORT hb_setCursor( BOOL bSetCursor, USHORT usNewCursor )
    return usPreviousCursor;
 }
 
-HARBOUR HB_SETCURSOR( void )
+HB_FUNC( SETCURSOR )
 {
    hb_retni( hb_setCursor( ISNUM( 1 ), hb_parni( 1 ) ) );
 }

harbour/source/rtl/setpos.c

@@ -50,14 +50,14 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_SETPOS( void ) /* Sets the screen position */
+HB_FUNC( SETPOS ) /* Sets the screen position */
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_gtSetPos( hb_parni( 1 ), hb_parni( 2 ) );
 }
 
 /* Move the screen position to the right by one column */
-HARBOUR HB_SETPOSBS( void )
+HB_FUNC( SETPOSBS )
 {
    SHORT iRow, iCol;
 
@@ -67,7 +67,7 @@ HARBOUR HB_SETPOSBS( void )
    hb_gtSetPos( iRow, iCol + 1 );
 }
 
-HARBOUR HB_ROW( void ) /* Return the current screen row position (zero origin) */
+HB_FUNC( ROW ) /* Return the current screen row position (zero origin) */
 {
    SHORT iRow;
    SHORT iCol;
@@ -77,7 +77,7 @@ HARBOUR HB_ROW( void ) /* Return the current screen row position (zero origin) *
    hb_retni( iRow );
 }
 
-HARBOUR HB_COL( void ) /* Return the current screen column position (zero origin) */
+HB_FUNC( COL ) /* Return the current screen column position (zero origin) */
 {
    SHORT iRow;
    SHORT iCol;

harbour/source/rtl/shadow.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_HB_SHADOW( void )
+HB_FUNC( HB_SHADOW )
 {
    if( hb_pcount() >= 4 )
       hb_gtDrawShadow( hb_parni( 1 ),
@@ -46,8 +46,8 @@ HARBOUR HB_HB_SHADOW( void )
                        ISNUM( 5 ) ? hb_parni( 5 ) : 7 );
 }
 
-HARBOUR HB_DBGSHADOW( void )
+HB_FUNC( DBGSHADOW )
 {
-   HB_HB_SHADOW();
+   HB_FUNCNAME( HB_SHADOW )();
 }
 

harbour/source/rtl/soundex.c

@@ -40,7 +40,7 @@
 
 #define SOUNDEX_LEN_MAX         4
 
-HARBOUR HB_SOUNDEX( void )
+HB_FUNC( SOUNDEX )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
    char szResult[ SOUNDEX_LEN_MAX + 1 ];

harbour/source/rtl/space.c

@@ -39,7 +39,7 @@
 
 /* returns n copies of a single space */
 /* TEST: QOUT( "space( 5 ) = '" + space( 5 ) + "'" ) */
-HARBOUR HB_SPACE( void )
+HB_FUNC( SPACE )
 {
    if( ISNUM( 1 ) )
    {

harbour/source/rtl/str.c

@@ -37,7 +37,7 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 
-HARBOUR HB_STR( void )
+HB_FUNC( STR )
 {
    BOOL bValid;
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );

harbour/source/rtl/strcase.c

@@ -81,7 +81,7 @@ char * hb_strncpyUpper( char * pDest, const char * pSource, ULONG ulLen )
 }
 
 /* converts string to lower case */
-HARBOUR HB_LOWER( void )
+HB_FUNC( LOWER )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
@@ -107,7 +107,7 @@ HARBOUR HB_LOWER( void )
 }
 
 /* converts string to upper case */
-HARBOUR HB_UPPER( void )
+HB_FUNC( UPPER )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 

harbour/source/rtl/strtran.c

@@ -43,7 +43,7 @@
 
 /* replaces lots of characters in a string */
 /* TOFIX: Will not work with a search string of > 64 KB on some platforms */
-HARBOUR HB_STRTRAN( void )
+HB_FUNC( STRTRAN )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 

harbour/source/rtl/strzero.c

@@ -37,7 +37,7 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 
-HARBOUR HB_STRZERO( void )
+HB_FUNC( STRZERO )
 {
    if( hb_pcount() >= 1 && hb_pcount() <= 3 )
    {

harbour/source/rtl/stuff.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 
 /* replaces characters in a string */
-HARBOUR HB_STUFF( void )
+HB_FUNC( STUFF )
 {
    if( ISCHAR( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISCHAR( 4 ) )
    {

harbour/source/rtl/substr.c

@@ -39,7 +39,7 @@
 
 /* returns l characters from n characters into string */
 
-HARBOUR HB_SUBSTR( void )
+HB_FUNC( SUBSTR )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 

harbour/source/rtl/tone.c

@@ -60,7 +60,7 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_TONE( void )
+HB_FUNC( TONE )
 {
    if( ISNUM( 1 ) )
       hb_gtTone( hb_parnd( 1 ), ( ISNUM( 2 ) ? hb_parnd( 2 ) : 1.0 ) );

harbour/source/rtl/trace.c

@@ -35,12 +35,12 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_HB_TRACESTATE( void )
+HB_FUNC( HB_TRACESTATE )
 {
    hb_retni( hb_tracestate( ISNUM( 1 ) ? hb_parni( 1 ) : -1 ) );
 }
 
-HARBOUR HB_HB_TRACELEVEL( void )
+HB_FUNC( HB_TRACELEVEL )
 {
    hb_retni( hb_tracelevel( ISNUM( 1 ) ? hb_parni( 1 ) : -1 ) );
 }

harbour/source/rtl/transfrm.c

@@ -328,7 +328,7 @@ static char * NumPicture( char * szPic, ULONG ulPicLen, USHORT * puiPicFlags, do
    return szResult;
 }
 
-HARBOUR HB_TRANSFORM( void )
+HB_FUNC( TRANSFORM )
 {
    PHB_ITEM pExp = hb_param( 1, IT_ANY ); /* Input parameter */
    PHB_ITEM pPic = hb_param( 2, IT_STRING ); /* Picture string */

harbour/source/rtl/trim.c

@@ -74,7 +74,7 @@ ULONG hb_strRTrimLen( const char * szText, ULONG ulLen, BOOL bAnySpace )
 /* trims leading spaces from a string */
 /* TEST: QOUT( "ltrim( '  hello world  ' ) = '" + ltrim( '  hello world  ' ) + "'" ) */
 
-HARBOUR HB_LTRIM( void )
+HB_FUNC( LTRIM )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
@@ -101,7 +101,7 @@ HARBOUR HB_LTRIM( void )
 
 /* trims trailing spaces from a string */
 /* TEST: QOUT( "rtrim( '  hello world  ' ) = '" + rtrim( '  hello world  ' ) + "'" ) */
-HARBOUR HB_RTRIM( void )
+HB_FUNC( RTRIM )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
@@ -128,16 +128,16 @@ HARBOUR HB_RTRIM( void )
 /* NOTE: The second parameter is a Harbour extension [vszakats] */
 
 /* synonymn for RTRIM */
-HARBOUR HB_TRIM( void )
+HB_FUNC( TRIM )
 {
-   HB_RTRIM();
+   HB_FUNCNAME( RTRIM )();
 }
 
 /* NOTE: The second parameter is a Harbour extension [vszakats] */
 
 /* trims leading and trailing spaces from a string */
 /* TEST: QOUT( "alltrim( '  hello world  ' ) = '" + alltrim( '  hello world  ' ) + "'" ) */
-HARBOUR HB_ALLTRIM( void )
+HB_FUNC( ALLTRIM )
 {
    if( ISCHAR( 1 ) )
    {

harbour/source/rtl/type.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapierr.h"
 
-HARBOUR HB_TYPE( void )
+HB_FUNC( TYPE )
 {
    HB_ITEM_PTR pItem = hb_param( 1, IT_STRING );
 

harbour/source/rtl/val.c

@@ -46,7 +46,7 @@ double hb_strVal( const char * szText )
 }
 
 /* returns the numeric value of a character string representation of a number  */
-HARBOUR HB_VAL( void )
+HB_FUNC( VAL )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 

harbour/source/rtl/valtostr.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_HB_VALTOSTR( void )
+HB_FUNC( HB_VALTOSTR )
 {
    ULONG ulLen;
    BOOL bFreeReq;

harbour/source/rtl/valtype.c

@@ -67,7 +67,7 @@ char * hb_valtypeGet( HB_ITEM_PTR pItem )
    return "U";
 }
 
-HARBOUR HB_VALTYPE( void )
+HB_FUNC( VALTYPE )
 {
    hb_retc( hb_valtypeGet( hb_param( 1, IT_ANY ) ) );
 }

harbour/source/rtl/word.c

@@ -40,7 +40,7 @@
          in CALL commands parameter list, otherwise it will return
          NIL, in Harbour it will work anywhere. */
 
-HARBOUR HB_WORD( void )
+HB_FUNC( WORD )
 {
    if( ISNUM( 1 ) )
       hb_retni( hb_parni( 1 ) );

harbour/source/rtl/xhelp.c

@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbvm.h"
 
-HARBOUR HB___XHELP( void )
+HB_FUNC( __XHELP )
 {
    PHB_DYNS pDynSym = hb_dynsymFind( "HELP" );
 

harbour/source/tools/asciisum.c

@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_ASCIISUM( void )
+HB_FUNC( GT_ASCIISUM )
 {
 	char *str;
    int  len, i;

harbour/source/tools/ascpos.c

@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_ASCPOS( void )
+HB_FUNC( GT_ASCPOS )
 {
   char *s;
   ULONG p;

harbour/source/tools/atdiff.c

@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_ATDIFF( void )
+HB_FUNC( GT_ATDIFF )
 {
   char *s1, *s2;
   int pos, len;

harbour/source/tools/chareven.c

@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHAREVEN( void )
+HB_FUNC( GT_CHAREVEN )
 {
   char *s1, *s2;
   int len, i;

harbour/source/tools/charmix.c

@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHARMIX( void )
+HB_FUNC( GT_CHARMIX )
 {
   char *s1, *s2, *s3;
   int l1, l2, i, pos3;

harbour/source/tools/charodd.c

@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHARODD( void )
+HB_FUNC( GT_CHARODD )
 {
   char *s1, *s2;
   int len, i;

harbour/source/tools/chrcount.c

@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHRCOUNT( void )
+HB_FUNC( GT_CHRCOUNT )
 {
   char *s1, *s2;
   int count, pos2, len;

harbour/source/tools/chrfirst.c

@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHRFIRST( void )
+HB_FUNC( GT_CHRFIRST )
 {
   char *string;
   char *cset;