diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1cd7f7b841..d2f37a7181 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,57 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-09 17:03 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * contrib/gtwvg/wvgcore.c + * contrib/gtwvg/wvgutils.c + * contrib/hbwin/win_dll.c + * contrib/hbwin/win_ole.c + * contrib/xhb/cstructc.c + * contrib/xhb/dbgfxc.c + * source/common/hbarch.c + * source/common/hbdate.c + * source/common/hbfsapi.c + * source/common/hbstr.c + * source/common/hbver.c + * source/common/hbverdsp.c + * source/debug/dbgentry.c + * source/main/harbour.c + * source/rdd/dbf1.c + * source/rdd/nulsys/nulsys.c + * source/rdd/wacore.c + * source/rdd/wafunc.c + * source/rdd/workarea.c + * source/rtl/cdpapi.c + * source/rtl/console.c + * source/rtl/dates.c + * source/rtl/errorint.c + * source/rtl/file.c + * source/rtl/filesys.c + * source/rtl/fscopy.c + * source/rtl/fserror.c + * source/rtl/fstemp.c + * source/rtl/gtapi.c + * source/rtl/gtapiu.c + * source/rtl/hbadler.c + * source/rtl/hbcrc.c + * source/rtl/hbffind.c + * source/rtl/hbgtcore.c + * source/rtl/hbmd5.c + * source/rtl/inkeyapi.c + * source/rtl/isprint.c + * source/rtl/math.c + * source/rtl/mouseapi.c + * source/rtl/seconds.c + * source/rtl/setcolor.c + * source/rtl/setcurs.c + * source/rtl/strmatch.c + * source/vm/hvm.c + % Removed HB_EXPORT from function definitions. + Placing it in declaration is enough. + + * source/debug/dbgentry.c + * Formatting. + 2008-11-09 16:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/hbcurl/hbcurl.c * contrib/hbcurl/hbcurl.ch diff --git a/harbour/contrib/gtwvg/wvgcore.c b/harbour/contrib/gtwvg/wvgcore.c index 91eb395ebc..29e7ea31a6 100644 --- a/harbour/contrib/gtwvg/wvgcore.c +++ b/harbour/contrib/gtwvg/wvgcore.c @@ -99,7 +99,7 @@ HB_FUNC( WVT_CORE ) //-------------------------------------------------------------------// -HB_EXPORT void hb_wvt_GetStringAttrib( USHORT top, USHORT left, USHORT bottom, USHORT right, BYTE * sBuffer, BYTE * sAttrib ) +void hb_wvt_GetStringAttrib( USHORT top, USHORT left, USHORT bottom, USHORT right, BYTE * sBuffer, BYTE * sAttrib ) { USHORT irow, icol, j; @@ -124,7 +124,7 @@ HB_EXPORT void hb_wvt_GetStringAttrib( USHORT top, USHORT left, USHORT bottom, U //-------------------------------------------------------------------// -HB_EXPORT void hb_wvt_PutStringAttrib( USHORT top, USHORT left, USHORT bottom, USHORT right, BYTE * sBuffer, BYTE * sAttrib ) +void hb_wvt_PutStringAttrib( USHORT top, USHORT left, USHORT bottom, USHORT right, BYTE * sBuffer, BYTE * sAttrib ) { USHORT irow, icol, j; @@ -147,7 +147,7 @@ HB_EXPORT void hb_wvt_PutStringAttrib( USHORT top, USHORT left, USHORT bottom, U // // Courtesy - Augusto Infante - Thanks // -HB_EXPORT IPicture * hb_wvt_gtLoadPictureFromResource( LPCSTR cResource, LPCSTR cSection ) +IPicture * hb_wvt_gtLoadPictureFromResource( LPCSTR cResource, LPCSTR cSection ) { HRSRC res = 0; LPVOID iPicture = NULL; @@ -186,7 +186,7 @@ HB_EXPORT IPicture * hb_wvt_gtLoadPictureFromResource( LPCSTR cResource, LPCSTR //--------------------------------------------------------------------// -HB_EXPORT IPicture * hb_wvt_gtLoadPicture( char * cImage ) +IPicture * hb_wvt_gtLoadPicture( char * cImage ) { IStream *iStream; LPVOID iPicture = NULL; @@ -225,7 +225,7 @@ HB_EXPORT IPicture * hb_wvt_gtLoadPicture( char * cImage ) //-------------------------------------------------------------------// -BOOL HB_EXPORT hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture ) +BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -321,7 +321,7 @@ BOOL HB_EXPORT hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture //-------------------------------------------------------------------// -BOOL HB_EXPORT hb_wvt_gtDestroyPicture( IPicture * iPicture ) +BOOL hb_wvt_gtDestroyPicture( IPicture * iPicture ) { BOOL bResult = FALSE; @@ -336,7 +336,7 @@ BOOL HB_EXPORT hb_wvt_gtDestroyPicture( IPicture * iPicture ) //-------------------------------------------------------------------// -POINT HB_EXPORT hb_wvt_gtGetXYFromColRow( USHORT col, USHORT row ) +POINT hb_wvt_gtGetXYFromColRow( USHORT col, USHORT row ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -354,7 +354,7 @@ POINT HB_EXPORT hb_wvt_gtGetXYFromColRow( USHORT col, USHORT row ) // //-------------------------------------------------------------------// -HB_EXPORT BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) +BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -460,7 +460,7 @@ HB_EXPORT BOOL CALLBACK hb_wvt_gtDlgProcMLess( HWND hDlg, UINT message, WPARAM w //-------------------------------------------------------------------// -HB_EXPORT BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) +BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -574,7 +574,7 @@ HB_EXPORT BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM w //-------------------------------------------------------------------// -HB_EXPORT BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, char * image ) +BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, char * image ) { HGLOBAL hGlobal; HANDLE hFile; diff --git a/harbour/contrib/gtwvg/wvgutils.c b/harbour/contrib/gtwvg/wvgutils.c index 03a2474e58..2ce1cd3f94 100644 --- a/harbour/contrib/gtwvg/wvgutils.c +++ b/harbour/contrib/gtwvg/wvgutils.c @@ -1298,7 +1298,7 @@ HB_FUNC( WVT__MAKEDLGTEMPLATE ) // Helper routine. Take an input pointer, return closest // pointer that is aligned on a DWORD (4 byte) boundary. // -HB_EXPORT LPWORD lpwAlign( LPWORD lpIn ) +LPWORD lpwAlign( LPWORD lpIn ) { HB_PTRDIFF ul = ( HB_PTRDIFF ) lpIn; @@ -1310,7 +1310,7 @@ HB_EXPORT LPWORD lpwAlign( LPWORD lpIn ) //----------------------------------------------------------------------------- -HB_EXPORT int nCopyAnsiToWideChar( LPWORD lpWCStr, LPSTR lpAnsiIn ) +int nCopyAnsiToWideChar( LPWORD lpWCStr, LPSTR lpAnsiIn ) { int nChar = 0; diff --git a/harbour/contrib/hbwin/win_dll.c b/harbour/contrib/hbwin/win_dll.c index e184971913..eba065bf08 100644 --- a/harbour/contrib/hbwin/win_dll.c +++ b/harbour/contrib/hbwin/win_dll.c @@ -80,10 +80,10 @@ static PHB_DYNS s_pBUFFER; static PHB_DYNS s_pDEVALUE; HB_EXTERN_BEGIN -HB_EXPORT char * hb_parcstruct( int iParam, ... ); +char * hb_parcstruct( int iParam, ... ); HB_EXTERN_END -HB_EXPORT char * hb_parcstruct( int iParam, ... ) +char * hb_parcstruct( int iParam, ... ) { HB_THREAD_STUB_ANY diff --git a/harbour/contrib/hbwin/win_ole.c b/harbour/contrib/hbwin/win_ole.c index 2471c1993b..7f449c32ee 100644 --- a/harbour/contrib/hbwin/win_ole.c +++ b/harbour/contrib/hbwin/win_ole.c @@ -145,7 +145,7 @@ HRESULT hb_oleVariantToItem( PHB_ITEM pItem, VARIANT *pVariant ); static PHB_ITEM SafeArrayToArray( SAFEARRAY * parray, UINT iDim, long * rgIndices, VARTYPE vt ); /* ----------------------------------------------------------------------- */ -HB_EXPORT BSTR hb_oleAnsiToSysString( const char * cString ) +BSTR hb_oleAnsiToSysString( const char * cString ) { int nConvertedLen = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, cString, -1, NULL, 0 ); @@ -163,7 +163,7 @@ HB_EXPORT BSTR hb_oleAnsiToSysString( const char * cString ) } /* ----------------------------------------------------------------------- */ -HB_EXPORT LPWSTR hb_oleAnsiToWide( LPSTR cString ) +LPWSTR hb_oleAnsiToWide( LPSTR cString ) { int nConvertedLen = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, cString, -1, NULL, 0 ); @@ -249,7 +249,7 @@ HB_FUNC( ANSITOWIDE ) /* ( cAnsiStr ) -> cWideStr */ } /* ----------------------------------------------------------------------- */ -HB_EXPORT LPSTR hb_oleWideToAnsi( BSTR wString ) +LPSTR hb_oleWideToAnsi( BSTR wString ) { int nConvertedLen = WideCharToMultiByte( CP_ACP, 0, wString, -1, NULL, 0, NULL, NULL ); @@ -286,7 +286,7 @@ HB_FUNC( WIDETOANSI ) /* ( cWideStr, nLen ) -> cAnsiStr */ } /* ----------------------------------------------------------------------- */ -HB_EXPORT void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) +void hb_oleItemToVariant( VARIANT *pVariant, PHB_ITEM pItem ) { BOOL bByRef; VARIANT mVariant; diff --git a/harbour/contrib/xhb/cstructc.c b/harbour/contrib/xhb/cstructc.c index 49ef8e11fd..d7f3c12c5c 100644 --- a/harbour/contrib/xhb/cstructc.c +++ b/harbour/contrib/xhb/cstructc.c @@ -113,7 +113,7 @@ static PHB_ITEM hb_itemPutCRawStatic( PHB_ITEM pItem, const char * szText, ULONG #ifdef hb_retclenAdoptRaw #undef hb_retclenAdoptRaw #endif -HB_EXPORT void hb_retclenAdoptRaw( const char * szText, ULONG ulLen ) +void hb_retclenAdoptRaw( const char * szText, ULONG ulLen ) { hb_itemPutCRaw( hb_stackReturnItem(), szText, ulLen ); } @@ -121,7 +121,7 @@ HB_EXPORT void hb_retclenAdoptRaw( const char * szText, ULONG ulLen ) #ifdef hb_retclenStatic #undef hb_retclenStatic #endif -HB_EXPORT void hb_retclenStatic( const char * szText, ULONG ulLen ) +void hb_retclenStatic( const char * szText, ULONG ulLen ) { hb_itemPutCRawStatic( hb_stackReturnItem(), szText, ulLen ); } diff --git a/harbour/contrib/xhb/dbgfxc.c b/harbour/contrib/xhb/dbgfxc.c index a7dfe4c2a5..0460a70115 100644 --- a/harbour/contrib/xhb/dbgfxc.c +++ b/harbour/contrib/xhb/dbgfxc.c @@ -61,14 +61,14 @@ static BOOL s_bToLogFile = TRUE; static BOOL s_bEmptyLogFile = TRUE; -HB_EXPORT BOOL hb_ToOutDebugOnOff( BOOL bOnOff ) +BOOL hb_ToOutDebugOnOff( BOOL bOnOff ) { BOOL bOld = s_bToOutputDebug; s_bToOutputDebug = bOnOff; return bOld; } -HB_EXPORT void hb_ToOutDebug( const char * sTraceMsg, ... ) +void hb_ToOutDebug( const char * sTraceMsg, ... ) { if( sTraceMsg && s_bToOutputDebug ) { @@ -83,21 +83,21 @@ HB_EXPORT void hb_ToOutDebug( const char * sTraceMsg, ... ) } } -HB_EXPORT BOOL hb_ToLogFileOnOff( BOOL bOnOff ) +BOOL hb_ToLogFileOnOff( BOOL bOnOff ) { BOOL bOld = s_bToLogFile; s_bToLogFile = bOnOff; return bOld; } -HB_EXPORT BOOL hb_EmptyLogFile( BOOL bOnOff ) +BOOL hb_EmptyLogFile( BOOL bOnOff ) { BOOL bOld = s_bEmptyLogFile; s_bEmptyLogFile = bOnOff; return bOld; } -HB_EXPORT void hb_ToLogFile( const char * sFile, const char * sTraceMsg, ... ) +void hb_ToLogFile( const char * sFile, const char * sTraceMsg, ... ) { if( s_bToLogFile ) { diff --git a/harbour/source/common/hbarch.c b/harbour/source/common/hbarch.c index 49706a41e8..5942657675 100644 --- a/harbour/source/common/hbarch.c +++ b/harbour/source/common/hbarch.c @@ -71,7 +71,7 @@ #define HB_EXPONENT_MASK ( ( 1 << HB_EXPONENT_BITS ) - 1 ) #define HB_EXPONENT_ADD 0x3ff -HB_EXPORT void hb_put_ieee754( BYTE * ptr, double d ) +void hb_put_ieee754( BYTE * ptr, double d ) { int iExp, iSig; double df; @@ -119,7 +119,7 @@ HB_EXPORT void hb_put_ieee754( BYTE * ptr, double d ) #endif } -HB_EXPORT double hb_get_ieee754( BYTE * ptr ) +double hb_get_ieee754( BYTE * ptr ) { int iExp, iSig; #if defined( HB_LONG_LONG_OFF ) @@ -159,7 +159,7 @@ HB_EXPORT double hb_get_ieee754( BYTE * ptr ) #endif } -HB_EXPORT void hb_put_ord_ieee754( BYTE * ptr, double d ) +void hb_put_ord_ieee754( BYTE * ptr, double d ) { int iExp, iSig; double df; @@ -194,7 +194,7 @@ HB_EXPORT void hb_put_ord_ieee754( BYTE * ptr, double d ) HB_PUT_BE_UINT32( ptr + 4, l1 ); } -HB_EXPORT double hb_get_ord_ieee754( BYTE * ptr ) +double hb_get_ord_ieee754( BYTE * ptr ) { int iExp, iSig; UINT32 l1, l2; @@ -225,7 +225,7 @@ HB_EXPORT double hb_get_ord_ieee754( BYTE * ptr ) * some compilers does not like constraction used by in HB_GET_LE_DOUBLE * macro => d = { ... } */ -HB_EXPORT double hb_get_rev_double( BYTE * ptr ) +double hb_get_rev_double( BYTE * ptr ) { union { double dbl; @@ -246,7 +246,7 @@ HB_EXPORT double hb_get_rev_double( BYTE * ptr ) return u.dbl; } -HB_EXPORT double hb_get_std_double( BYTE * ptr ) +double hb_get_std_double( BYTE * ptr ) { union { double dbl; @@ -275,7 +275,7 @@ HB_EXPORT double hb_get_std_double( BYTE * ptr ) * values. They are necessary for extracting such number from PCODE, * databases or serialization streams in RPC */ -HB_EXPORT double hb_get_le_uint64( BYTE * ptr ) +double hb_get_le_uint64( BYTE * ptr ) { UINT32 l1, l2; @@ -286,7 +286,7 @@ HB_EXPORT double hb_get_le_uint64( BYTE * ptr ) return ldexp( ( double ) l2, 32 ) + ( double ) l1; } -HB_EXPORT double hb_get_le_int64( BYTE * ptr ) +double hb_get_le_int64( BYTE * ptr ) { UINT32 l1; INT32 l2; @@ -298,7 +298,7 @@ HB_EXPORT double hb_get_le_int64( BYTE * ptr ) return ldexp( ( double ) l2, 32 ) + ( double ) l1; } -HB_EXPORT void hb_put_le_uint64( BYTE * ptr, double d ) +void hb_put_le_uint64( BYTE * ptr, double d ) { UINT32 l1, l2; diff --git a/harbour/source/common/hbdate.c b/harbour/source/common/hbdate.c index a56bcb1694..63563db1d7 100644 --- a/harbour/source/common/hbdate.c +++ b/harbour/source/common/hbdate.c @@ -82,7 +82,7 @@ #define HB_STR_DATE_BASE 1721060 /* 0000/01/01 */ -HB_EXPORT LONG hb_dateEncode( int iYear, int iMonth, int iDay ) +LONG hb_dateEncode( int iYear, int iMonth, int iDay ) { HB_TRACE(HB_TR_DEBUG, ("hb_dateEncode(%d, %d, %d)", iYear, iMonth, iDay)); @@ -111,7 +111,7 @@ HB_EXPORT LONG hb_dateEncode( int iYear, int iMonth, int iDay ) return 0; } -HB_EXPORT void hb_dateDecode( LONG lJulian, int *piYear, int *piMonth, int *piDay ) +void hb_dateDecode( LONG lJulian, int *piYear, int *piMonth, int *piDay ) { HB_TRACE(HB_TR_DEBUG, ("hb_dateDecode(%ld, %p, %p, %p)", lJulian, piYear, piMonth, piDay)); @@ -139,7 +139,7 @@ HB_EXPORT void hb_dateDecode( LONG lJulian, int *piYear, int *piMonth, int *piDa } } -HB_EXPORT void hb_dateStrPut( char * szDate, int iYear, int iMonth, int iDay ) +void hb_dateStrPut( char * szDate, int iYear, int iMonth, int iDay ) { HB_TRACE(HB_TR_DEBUG, ("hb_dateStrPut(%p, %d, %d, %d)", szDate, iYear, iMonth, iDay)); @@ -162,7 +162,7 @@ HB_EXPORT void hb_dateStrPut( char * szDate, int iYear, int iMonth, int iDay ) } } -HB_EXPORT void hb_dateStrGet( const char * szDate, int * piYear, int * piMonth, int * piDay ) +void hb_dateStrGet( const char * szDate, int * piYear, int * piMonth, int * piDay ) { HB_TRACE(HB_TR_DEBUG, ("hb_dateStrGet(%s, %p, %p, %p)", szDate, piYear, piMonth, piDay)); @@ -200,7 +200,7 @@ HB_EXPORT void hb_dateStrGet( const char * szDate, int * piYear, int * piMonth, /* This function always closes the date with a zero byte, so it needs a 9 character long buffer. */ -HB_EXPORT char * hb_dateDecStr( char * szDate, LONG lJulian ) +char * hb_dateDecStr( char * szDate, LONG lJulian ) { int iYear, iMonth, iDay; @@ -220,7 +220,7 @@ HB_EXPORT char * hb_dateDecStr( char * szDate, LONG lJulian ) return szDate; } -HB_EXPORT LONG hb_dateEncStr( const char * szDate ) +LONG hb_dateEncStr( const char * szDate ) { int iYear, iMonth, iDay; @@ -231,7 +231,7 @@ HB_EXPORT LONG hb_dateEncStr( const char * szDate ) return hb_dateEncode( iYear, iMonth, iDay ); } -HB_EXPORT int hb_dateJulianDOW( LONG lJulian ) +int hb_dateJulianDOW( LONG lJulian ) { HB_TRACE(HB_TR_DEBUG, ("hb_dateJulianDOW(%ld)", lJulian)); @@ -241,7 +241,7 @@ HB_EXPORT int hb_dateJulianDOW( LONG lJulian ) return 0; } -HB_EXPORT int hb_dateDOW( int iYear, int iMonth, int iDay ) +int hb_dateDOW( int iYear, int iMonth, int iDay ) { HB_TRACE(HB_TR_DEBUG, ("hb_dateDOW(%d, %d, %d)", iYear, iMonth, iDay)); @@ -257,7 +257,7 @@ HB_EXPORT int hb_dateDOW( int iYear, int iMonth, int iDay ) iYear + iYear / 4 - iYear / 100 + iYear / 400 + 6 ) % 7 + 1; } -HB_EXPORT void hb_dateToday( int * piYear, int * piMonth, int * piDay ) +void hb_dateToday( int * piYear, int * piMonth, int * piDay ) { #if defined(HB_OS_WIN_32) @@ -297,7 +297,7 @@ HB_EXPORT void hb_dateToday( int * piYear, int * piMonth, int * piDay ) /* NOTE: The passed buffer must be at least 9 chars long */ -HB_EXPORT void hb_dateTimeStr( char * pszTime ) +void hb_dateTimeStr( char * pszTime ) { #if defined(HB_OS_WIN_32) { @@ -327,7 +327,7 @@ HB_EXPORT void hb_dateTimeStr( char * pszTime ) #endif } -HB_EXPORT LONG hb_timeStampEncode( int iHour, int iMinutes, int iSeconds, int iMSec ) +LONG hb_timeStampEncode( int iHour, int iMinutes, int iSeconds, int iMSec ) { LONG lMillisec; @@ -349,7 +349,7 @@ HB_EXPORT LONG hb_timeStampEncode( int iHour, int iMinutes, int iSeconds, int iM return lMillisec; } -HB_EXPORT void hb_timeStampDecode( LONG lMillisec, int * piHour, int * piMinutes, +void hb_timeStampDecode( LONG lMillisec, int * piHour, int * piMinutes, int * piSeconds, int * piMSec ) { HB_TRACE(HB_TR_DEBUG, ("hb_timeStampDecode(%ld, %p, %p, %p, %p)", lMillisec, piHour, piMinutes, piSeconds, piMSec)); @@ -376,7 +376,7 @@ HB_EXPORT void hb_timeStampDecode( LONG lMillisec, int * piHour, int * piMinutes /* This function always closes the time with a zero byte, so it needs a 13 character long buffer. */ -HB_EXPORT char * hb_timeStampStr( char * szTime, LONG lMillisec ) +char * hb_timeStampStr( char * szTime, LONG lMillisec ) { int iHour, iMinutes, iSeconds, iMSec; @@ -393,7 +393,7 @@ HB_EXPORT char * hb_timeStampStr( char * szTime, LONG lMillisec ) /* This function always closes the time with a zero byte, so it needs a 24 character long buffer. */ -HB_EXPORT char * hb_dateTimeStampStr( char * szDateTime, LONG lJulian, LONG lMillisec ) +char * hb_dateTimeStampStr( char * szDateTime, LONG lJulian, LONG lMillisec ) { int iYear, iMonth, iDay, iHour, iMinutes, iSeconds, iMSec; @@ -408,7 +408,7 @@ HB_EXPORT char * hb_dateTimeStampStr( char * szDateTime, LONG lJulian, LONG lMil return szDateTime; } -HB_EXPORT void hb_timeStrGet( const char * szTime, int * piHour, int * piMinutes, +void hb_timeStrGet( const char * szTime, int * piHour, int * piMinutes, int * piSeconds, int * piMSec ) { int iHour, iMinutes, iSeconds, iMSec; @@ -459,7 +459,7 @@ HB_EXPORT void hb_timeStrGet( const char * szTime, int * piHour, int * piMinutes *piMSec = iMSec; } -HB_EXPORT void hb_dateTimeStampStrGet( const char * szDateTime, LONG * plJulian, LONG * plMillisec ) +void hb_dateTimeStampStrGet( const char * szDateTime, LONG * plJulian, LONG * plMillisec ) { int iLen; diff --git a/harbour/source/common/hbfsapi.c b/harbour/source/common/hbfsapi.c index fecbaf8660..1155141732 100644 --- a/harbour/source/common/hbfsapi.c +++ b/harbour/source/common/hbfsapi.c @@ -87,7 +87,7 @@ extern void hb_fhnd_ForceLink( void ); /* * Function that adds zero or more paths to a list of pathnames to search */ -HB_EXPORT void hb_fsAddSearchPath( const char * szPath, HB_PATHNAMES ** pSearchList ) +void hb_fsAddSearchPath( const char * szPath, HB_PATHNAMES ** pSearchList ) { char * pPath; char * pDelim; @@ -118,7 +118,7 @@ HB_EXPORT void hb_fsAddSearchPath( const char * szPath, HB_PATHNAMES ** pSearchL /* * free list of pathnames to search */ -HB_EXPORT void hb_fsFreeSearchPath( HB_PATHNAMES * pSearchList ) +void hb_fsFreeSearchPath( HB_PATHNAMES * pSearchList ) { HB_PATHNAMES * pNext; @@ -137,7 +137,7 @@ HB_EXPORT void hb_fsFreeSearchPath( HB_PATHNAMES * pSearchList ) } /* Split given filename into path, name and extension, plus determine drive */ -HB_EXPORT PHB_FNAME hb_fsFNameSplit( const char * pszFileName ) +PHB_FNAME hb_fsFNameSplit( const char * pszFileName ) { PHB_FNAME pFileName; char * pszPos, cDirSep; @@ -230,7 +230,7 @@ HB_EXPORT PHB_FNAME hb_fsFNameSplit( const char * pszFileName ) */ /* This function joins path, name and extension into a string with a filename */ -HB_EXPORT char * hb_fsFNameMerge( char * pszFileName, PHB_FNAME pFileName ) +char * hb_fsFNameMerge( char * pszFileName, PHB_FNAME pFileName ) { const char * pszName; char cDirSep; @@ -291,7 +291,7 @@ HB_EXPORT char * hb_fsFNameMerge( char * pszFileName, PHB_FNAME pFileName ) return pszFileName; } -HB_EXPORT BOOL hb_fsNameExists( const char * pszFileName ) +BOOL hb_fsNameExists( const char * pszFileName ) { BOOL fExist; BOOL fFree; @@ -342,7 +342,7 @@ HB_EXPORT BOOL hb_fsNameExists( const char * pszFileName ) return fExist; } -HB_EXPORT BOOL hb_fsFileExists( const char * pszFileName ) +BOOL hb_fsFileExists( const char * pszFileName ) { BOOL fExist; BOOL fFree; @@ -402,7 +402,7 @@ HB_EXPORT BOOL hb_fsFileExists( const char * pszFileName ) return fExist; } -HB_EXPORT BOOL hb_fsDirExists( const char * pszDirName ) +BOOL hb_fsDirExists( const char * pszDirName ) { BOOL fExist; BOOL fFree; @@ -461,7 +461,7 @@ HB_EXPORT BOOL hb_fsDirExists( const char * pszDirName ) return fExist; } -HB_EXPORT BOOL hb_fsMaxFilesError( void ) +BOOL hb_fsMaxFilesError( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsMaxFilesError()")); diff --git a/harbour/source/common/hbstr.c b/harbour/source/common/hbstr.c index c182640694..645221394c 100644 --- a/harbour/source/common/hbstr.c +++ b/harbour/source/common/hbstr.c @@ -84,7 +84,7 @@ const char * hb_szAscii[ 256 ] = { "\x00", "\x01", "\x02", "\x03", "\x04", "\x05 "\xE0", "\xE1", "\xE2", "\xE3", "\xE4", "\xE5", "\xE6", "\xE7", "\xE8", "\xE9", "\xEA", "\xEB", "\xEC", "\xED", "\xEE", "\xEF", "\xF0", "\xF1", "\xF2", "\xF3", "\xF4", "\xF5", "\xF6", "\xF7", "\xF8", "\xF9", "\xFA", "\xFB", "\xFC", "\xFD", "\xFE", "\xFF" }; -HB_EXPORT ULONG hb_strAt( const char * szSub, ULONG ulSubLen, const char * szText, ULONG ulLen ) +ULONG hb_strAt( const char * szSub, ULONG ulSubLen, const char * szText, ULONG ulLen ) { HB_TRACE(HB_TR_DEBUG, ("hb_strAt(%s, %lu, %s, %lu)", szSub, ulSubLen, szText, ulLen)); @@ -117,7 +117,7 @@ HB_EXPORT ULONG hb_strAt( const char * szSub, ULONG ulSubLen, const char * szTex return 0; } -HB_EXPORT BOOL hb_strEmpty( const char * szText, ULONG ulLen ) +BOOL hb_strEmpty( const char * szText, ULONG ulLen ) { HB_TRACE(HB_TR_DEBUG, ("hb_strEmpty(%s, %lu)", szText, ulLen)); @@ -132,7 +132,7 @@ HB_EXPORT BOOL hb_strEmpty( const char * szText, ULONG ulLen ) return TRUE; } -HB_EXPORT char * hb_strupr( char * pszText ) +char * hb_strupr( char * pszText ) { char * pszPos; @@ -144,7 +144,7 @@ HB_EXPORT char * hb_strupr( char * pszText ) return pszText; } -HB_EXPORT char * hb_strlow( char * pszText ) +char * hb_strlow( char * pszText ) { char * pszPos; @@ -156,7 +156,7 @@ HB_EXPORT char * hb_strlow( char * pszText ) return pszText; } -HB_EXPORT char * hb_strdup( const char * pszText ) +char * hb_strdup( const char * pszText ) { char * pszDup; ULONG ulLen = strlen( pszText ) + 1; @@ -169,7 +169,7 @@ HB_EXPORT char * hb_strdup( const char * pszText ) return pszDup; } -HB_EXPORT char * hb_strndup( const char * pszText, ULONG ulLen ) +char * hb_strndup( const char * pszText, ULONG ulLen ) { char * pszDup; ULONG ul; @@ -188,7 +188,7 @@ HB_EXPORT char * hb_strndup( const char * pszText, ULONG ulLen ) return pszDup; } -HB_EXPORT ULONG hb_strnlen( const char * pszText, ULONG ulLen ) +ULONG hb_strnlen( const char * pszText, ULONG ulLen ) { ULONG ul = 0; @@ -200,7 +200,7 @@ HB_EXPORT ULONG hb_strnlen( const char * pszText, ULONG ulLen ) return ul; } -HB_EXPORT char * hb_strduptrim( const char * pszText ) +char * hb_strduptrim( const char * pszText ) { char * pszDup; ULONG ulLen; @@ -221,7 +221,7 @@ HB_EXPORT char * hb_strduptrim( const char * pszText ) return pszDup; } -HB_EXPORT ULONG hb_strlentrim( const char * pszText ) +ULONG hb_strlentrim( const char * pszText ) { ULONG ul = 0; @@ -239,7 +239,7 @@ HB_EXPORT ULONG hb_strlentrim( const char * pszText ) return ul; } -HB_EXPORT int hb_stricmp( const char * s1, const char * s2 ) +int hb_stricmp( const char * s1, const char * s2 ) { int rc = 0, c1, c2; @@ -265,7 +265,7 @@ HB_EXPORT int hb_stricmp( const char * s1, const char * s2 ) } /* warning: It is not case sensitive */ -HB_EXPORT int hb_strnicmp( const char * s1, const char * s2, ULONG count ) +int hb_strnicmp( const char * s1, const char * s2, ULONG count ) { ULONG ulCount; int rc = 0; @@ -294,7 +294,7 @@ AJ: 2004-02-23 Concatenates multiple strings into a single result. Eg. hb_xstrcat (buffer, "A", "B", NULL) stores "AB" in buffer. */ -HB_EXPORT char * hb_xstrcat( char * szDest, const char * szSrc, ... ) +char * hb_xstrcat( char * szDest, const char * szSrc, ... ) { char * szResult = szDest; va_list va; @@ -327,7 +327,7 @@ allocates a new buffer with the required length and returns that. The buffer is allocated using hb_xgrab(), and should eventually be freed using hb_xfree(). */ -HB_EXPORT char * hb_xstrcpy( char * szDest, const char * szSrc, ... ) +char * hb_xstrcpy( char * szDest, const char * szSrc, ... ) { char * szResult; va_list va; @@ -391,7 +391,7 @@ static double hb_numPow10( int nPrecision ) return pow( 10.0, ( double ) nPrecision ); } -HB_EXPORT double hb_numRound( double dNum, int iDec ) +double hb_numRound( double dNum, int iDec ) { static const double doBase = 10.0f; double doComplete5, doComplete5i, dPow; @@ -515,7 +515,7 @@ HB_EXPORT double hb_numRound( double dNum, int iDec ) return doComplete5i / dPow; } -HB_EXPORT double hb_numInt( double dNum ) +double hb_numInt( double dNum ) { double dInt; @@ -528,7 +528,7 @@ HB_EXPORT double hb_numInt( double dNum ) return dInt; } -HB_EXPORT double hb_numDecConv( double dNum, int iDec ) +double hb_numDecConv( double dNum, int iDec ) { if( iDec > 0 ) return hb_numRound( dNum / hb_numPow10( iDec ), iDec ); @@ -703,32 +703,32 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, ULONG ulLen, HB_LONG return fDbl; } -HB_EXPORT BOOL hb_compStrToNum( const char* szNum, ULONG ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth ) +BOOL hb_compStrToNum( const char* szNum, ULONG ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth ) { HB_TRACE(HB_TR_DEBUG, ("hb_compStrToNum( %s, %lu, %p, %p, %p, %p)", szNum, ulLen, plVal, pdVal, piDec, piWidth )); return hb_str2number( TRUE, szNum, ulLen, plVal, pdVal, piDec, piWidth ); } -HB_EXPORT BOOL hb_valStrnToNum( const char* szNum, ULONG ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth ) +BOOL hb_valStrnToNum( const char* szNum, ULONG ulLen, HB_LONG * plVal, double * pdVal, int * piDec, int * piWidth ) { HB_TRACE(HB_TR_DEBUG, ("hb_valStrToNum( %s, %lu, %p, %p, %p, %p)", szNum, ulLen, plVal, pdVal, piDec, piWidth )); return hb_str2number( FALSE, szNum, ulLen, plVal, pdVal, piDec, piWidth ); } -HB_EXPORT BOOL hb_strToNum( const char* szNum, HB_LONG * plVal, double * pdVal ) +BOOL hb_strToNum( const char* szNum, HB_LONG * plVal, double * pdVal ) { HB_TRACE(HB_TR_DEBUG, ("hb_strToNum(%s, %p, %p)", szNum, plVal, pdVal )); return hb_str2number( FALSE, szNum, strlen( szNum ), plVal, pdVal, NULL, NULL ); } -HB_EXPORT BOOL hb_strnToNum( const char* szNum, ULONG ulLen, HB_LONG * plVal, double * pdVal ) +BOOL hb_strnToNum( const char* szNum, ULONG ulLen, HB_LONG * plVal, double * pdVal ) { HB_TRACE(HB_TR_DEBUG, ("hb_strToNum(%s, %lu, %p, %p)", szNum, ulLen, plVal, pdVal )); return hb_str2number( FALSE, szNum, ulLen, plVal, pdVal, NULL, NULL ); } /* returns the numeric value of a character string representation of a number */ -HB_EXPORT double hb_strVal( const char * szText, ULONG ulLen ) +double hb_strVal( const char * szText, ULONG ulLen ) { HB_LONG lVal; double dVal; @@ -740,7 +740,7 @@ HB_EXPORT double hb_strVal( const char * szText, ULONG ulLen ) return dVal; } -HB_EXPORT HB_LONG hb_strValInt( const char * szText, int * iOverflow ) +HB_LONG hb_strValInt( const char * szText, int * iOverflow ) { HB_LONG lVal; double dVal; @@ -761,7 +761,7 @@ HB_EXPORT HB_LONG hb_strValInt( const char * szText, int * iOverflow ) * NOTE: Unlike the documentation for strncpy, this routine will always append * a null */ -HB_EXPORT char * hb_strncpy( char * pDest, const char * pSource, ULONG ulLen ) +char * hb_strncpy( char * pDest, const char * pSource, ULONG ulLen ) { char *pBuf = pDest; @@ -783,7 +783,7 @@ HB_EXPORT char * hb_strncpy( char * pDest, const char * pSource, ULONG ulLen ) * NOTE: Unlike the documentation for strncat, this routine will always append * a null and the ulLen param is pDest size not pSource limit */ -HB_EXPORT char * hb_strncat( char * pDest, const char * pSource, ULONG ulLen ) +char * hb_strncat( char * pDest, const char * pSource, ULONG ulLen ) { char *pBuf = pDest; @@ -816,7 +816,7 @@ HB_EXPORT char * hb_strncat( char * pDest, const char * pSource, ULONG ulLen ) * a null * pt */ -HB_EXPORT char * hb_strncpyLower( char * pDest, const char * pSource, ULONG ulLen ) +char * hb_strncpyLower( char * pDest, const char * pSource, ULONG ulLen ) { char *pBuf = pDest; @@ -845,7 +845,7 @@ HB_EXPORT char * hb_strncpyLower( char * pDest, const char * pSource, ULONG ulLe * a null * pt */ -HB_EXPORT char * hb_strncpyUpper( char * pDest, const char * pSource, ULONG ulLen ) +char * hb_strncpyUpper( char * pDest, const char * pSource, ULONG ulLen ) { char *pBuf = pDest; @@ -874,7 +874,7 @@ HB_EXPORT char * hb_strncpyUpper( char * pDest, const char * pSource, ULONG ulLe * a null * pt */ -HB_EXPORT char * hb_strncpyUpperTrim( char * pDest, const char * pSource, ULONG ulLen ) +char * hb_strncpyUpperTrim( char * pDest, const char * pSource, ULONG ulLen ) { char *pBuf = pDest; ULONG ulSLen; @@ -911,7 +911,7 @@ HB_EXPORT char * hb_strncpyUpperTrim( char * pDest, const char * pSource, ULONG * NOTE: Unlike the documentation for strncpy, this routine will always append * a null */ -HB_EXPORT char * hb_strncpyTrim( char * pDest, const char * pSource, ULONG ulLen ) +char * hb_strncpyTrim( char * pDest, const char * pSource, ULONG ulLen ) { char *pBuf = pDest; ULONG ulSLen; @@ -941,7 +941,7 @@ HB_EXPORT char * hb_strncpyTrim( char * pDest, const char * pSource, ULONG ulLen return pBuf; } -HB_EXPORT char * hb_strRemEscSeq( char *str, ULONG *pLen ) +char * hb_strRemEscSeq( char *str, ULONG *pLen ) { ULONG ul = *pLen, ulStripped = 0; char *ptr, *dst, ch; diff --git a/harbour/source/common/hbver.c b/harbour/source/common/hbver.c index 7dc5fcd74a..f096df5add 100644 --- a/harbour/source/common/hbver.c +++ b/harbour/source/common/hbver.c @@ -104,7 +104,7 @@ osVer.szCSDVersion (Win32). [vszakats] */ #define PLATFORM_BUF_SIZE 255 -HB_EXPORT char * hb_verPlatform( void ) +char * hb_verPlatform( void ) { char * pszPlatform; @@ -310,7 +310,7 @@ HB_EXPORT char * hb_verPlatform( void ) return pszPlatform; } -HB_EXPORT BOOL hb_iswinnt( void ) +BOOL hb_iswinnt( void ) { #if defined(HB_OS_WIN_32) static BOOL s_fWinNT = FALSE; @@ -330,7 +330,7 @@ HB_EXPORT BOOL hb_iswinnt( void ) #endif } -HB_EXPORT BOOL hb_iswince( void ) +BOOL hb_iswince( void ) { #if defined(HB_WINCE) return TRUE; @@ -343,7 +343,7 @@ HB_EXPORT BOOL hb_iswince( void ) #define COMPILER_BUF_SIZE 80 -HB_EXPORT char * hb_verCompiler( void ) +char * hb_verCompiler( void ) { char * pszCompiler; const char * pszName; @@ -550,7 +550,7 @@ HB_EXPORT char * hb_verCompiler( void ) CA-Cl*pper 5.3b returns: "Clipper (R) 5.3b Intl. (Rev. 338) (1997.04.25)" */ -HB_EXPORT char * hb_verHarbour( void ) +char * hb_verHarbour( void ) { char * pszVersion; @@ -564,7 +564,7 @@ HB_EXPORT char * hb_verHarbour( void ) return pszVersion; } -HB_EXPORT char * hb_verPCode( void ) +char * hb_verPCode( void ) { char * pszPCode; @@ -577,7 +577,7 @@ HB_EXPORT char * hb_verPCode( void ) return pszPCode; } -HB_EXPORT char * hb_verBuildDate( void ) +char * hb_verBuildDate( void ) { char * pszDate; diff --git a/harbour/source/common/hbverdsp.c b/harbour/source/common/hbverdsp.c index b0839e6b33..178a80725f 100644 --- a/harbour/source/common/hbverdsp.c +++ b/harbour/source/common/hbverdsp.c @@ -53,7 +53,7 @@ #include "hbapi.h" #include "hbmemory.ch" -HB_EXPORT void hb_verBuildInfo( void ) +void hb_verBuildInfo( void ) { hb_conOutErr( "Harbour Build Info", 0 ); hb_conOutErr( hb_conNewLine(), 0 ); diff --git a/harbour/source/debug/dbgentry.c b/harbour/source/debug/dbgentry.c index 7f29e42e87..2edb0a4898 100644 --- a/harbour/source/debug/dbgentry.c +++ b/harbour/source/debug/dbgentry.c @@ -122,14 +122,14 @@ typedef struct typedef struct { - char *szModule; - char *szFunction; - int nLine; - int nProcLevel; - int nLocals; - HB_VARINFO *aLocals; - int nStatics; - HB_VARINFO *aStatics; + char *szModule; + char *szFunction; + int nLine; + int nProcLevel; + int nLocals; + HB_VARINFO *aLocals; + int nStatics; + HB_VARINFO *aStatics; } HB_CALLSTACKINFO; typedef struct @@ -175,49 +175,28 @@ typedef struct } HB_DEBUGINFO; -static PHB_ITEM -hb_dbgActivateBreakArray( HB_DEBUGINFO *info ); -static PHB_ITEM -hb_dbgActivateModuleArray( HB_DEBUGINFO *info ); -static PHB_ITEM -hb_dbgActivateVarArray( int nVars, HB_VARINFO *aVars ); -static void -hb_dbgAddLocal( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ); -static void -hb_dbgAddModule( HB_DEBUGINFO *info, char *szName ); -static void -hb_dbgAddStack( HB_DEBUGINFO *info, char *szName, int nProcLevel ); -static void -hb_dbgAddStatic( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ); -static void -hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem ); -static void -hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, char *szName, char cType, int nIndex, int nFrame ); -static void -hb_dbgEndProc( HB_DEBUGINFO *info ); -static PHB_ITEM -hb_dbgEval( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ); -static PHB_ITEM -hb_dbgEvalMacro( char *szExpr, PHB_ITEM pItem ); -static PHB_ITEM -hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch ); -static PHB_ITEM -hb_dbgEvalResolve( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ); -static BOOL -hb_dbgIsAltD( void ); -static BOOL -hb_dbgIsBreakPoint( HB_DEBUGINFO *info, char *szModule, int nLine ); -static BOOL -hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 ); -static void -hb_dbgQuit( HB_DEBUGINFO *info ); -static PHB_ITEM -hb_dbgVarGet( HB_VARINFO *scope ); -static void -hb_dbgVarSet( HB_VARINFO *scope, PHB_ITEM xNewValue ); +static PHB_ITEM hb_dbgActivateBreakArray( HB_DEBUGINFO *info ); +static PHB_ITEM hb_dbgActivateModuleArray( HB_DEBUGINFO *info ); +static PHB_ITEM hb_dbgActivateVarArray( int nVars, HB_VARINFO *aVars ); +static void hb_dbgAddLocal( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ); +static void hb_dbgAddModule( HB_DEBUGINFO *info, char *szName ); +static void hb_dbgAddStack( HB_DEBUGINFO *info, char *szName, int nProcLevel ); +static void hb_dbgAddStatic( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ); +static void hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem ); +static void hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, char *szName, char cType, int nIndex, int nFrame ); +static void hb_dbgEndProc( HB_DEBUGINFO *info ); +static PHB_ITEM hb_dbgEval( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ); +static PHB_ITEM hb_dbgEvalMacro( char *szExpr, PHB_ITEM pItem ); +static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch ); +static PHB_ITEM hb_dbgEvalResolve( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ); +static BOOL hb_dbgIsAltD( void ); +static BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, char *szModule, int nLine ); +static BOOL hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 ); +static void hb_dbgQuit( HB_DEBUGINFO *info ); +static PHB_ITEM hb_dbgVarGet( HB_VARINFO *scope ); +static void hb_dbgVarSet( HB_VARINFO *scope, PHB_ITEM xNewValue ); -static void -hb_dbgActivate( HB_DEBUGINFO *info ) +static void hb_dbgActivate( HB_DEBUGINFO *info ) { PHB_DYNS pDynSym = hb_dynsymFind( "__DBGENTRY" ); @@ -272,8 +251,7 @@ hb_dbgActivate( HB_DEBUGINFO *info ) } -static PHB_ITEM -hb_dbgActivateBreakArray( HB_DEBUGINFO *info ) +static PHB_ITEM hb_dbgActivateBreakArray( HB_DEBUGINFO *info ) { int i; PHB_ITEM pArray = hb_itemArrayNew( info->nBreakPoints ); @@ -299,8 +277,7 @@ hb_dbgActivateBreakArray( HB_DEBUGINFO *info ) } -static PHB_ITEM -hb_dbgActivateModuleArray( HB_DEBUGINFO *info ) +static PHB_ITEM hb_dbgActivateModuleArray( HB_DEBUGINFO *info ) { int i; PHB_ITEM pArray = hb_itemArrayNew( info->nModules ); @@ -334,8 +311,7 @@ hb_dbgActivateModuleArray( HB_DEBUGINFO *info ) } -static PHB_ITEM -hb_dbgActivateVarArray( int nVars, HB_VARINFO *aVars ) +static PHB_ITEM hb_dbgActivateVarArray( int nVars, HB_VARINFO *aVars ) { int i; PHB_ITEM pArray = hb_itemArrayNew( nVars ); @@ -356,8 +332,7 @@ hb_dbgActivateVarArray( int nVars, HB_VARINFO *aVars ) } -HB_EXPORT void -hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, int nFrame ) +void hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, int nFrame ) { int i; ULONG nProcLevel; @@ -557,8 +532,7 @@ hb_dbgEntry( int nMode, int nLine, char *szName, int nIndex, int nFrame ) } -static char * -hb_dbgStripModuleName( char * szName ) +static char * hb_dbgStripModuleName( char * szName ) { char * ptr; @@ -575,8 +549,7 @@ hb_dbgStripModuleName( char * szName ) } -HB_EXPORT void -hb_dbgAddBreak( void *handle, char *cModule, int nLine, char *szFunction ) +void hb_dbgAddBreak( void *handle, char *cModule, int nLine, char *szFunction ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; HB_BREAKPOINT *pBreak; @@ -595,8 +568,7 @@ hb_dbgAddBreak( void *handle, char *cModule, int nLine, char *szFunction ) } -static void -hb_dbgAddLocal( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ) +static void hb_dbgAddLocal( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ) { if ( info->bInitGlobals ) { @@ -613,8 +585,7 @@ hb_dbgAddLocal( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ) } -static void -hb_dbgAddModule( HB_DEBUGINFO *info, char *szName ) +static void hb_dbgAddModule( HB_DEBUGINFO *info, char *szName ) { char * szModuleName; char * szFuncName; @@ -642,8 +613,7 @@ hb_dbgAddModule( HB_DEBUGINFO *info, char *szName ) } -static void -hb_dbgAddStack( HB_DEBUGINFO *info, char *szName, int nProcLevel ) +static void hb_dbgAddStack( HB_DEBUGINFO *info, char *szName, int nProcLevel ) { char szBuff[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5 ]; HB_CALLSTACKINFO *top; @@ -689,8 +659,7 @@ hb_dbgAddStack( HB_DEBUGINFO *info, char *szName, int nProcLevel ) } -static void -hb_dbgAddStatic( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ) +static void hb_dbgAddStatic( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ) { if ( info->bInitGlobals ) { @@ -714,8 +683,7 @@ hb_dbgAddStatic( HB_DEBUGINFO *info, char *szName, int nIndex, int nFrame ) } -static void -hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem ) +static void hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem ) { int i, nLinesLen; @@ -795,8 +763,7 @@ hb_dbgAddStopLines( HB_DEBUGINFO *info, PHB_ITEM pItem ) } -static void -hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, char *szName, char cType, int nIndex, int nFrame ) +static void hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, char *szName, char cType, int nIndex, int nFrame ) { HB_VARINFO *var; @@ -808,8 +775,7 @@ hb_dbgAddVar( int *nVars, HB_VARINFO **aVars, char *szName, char cType, int nInd } -HB_EXPORT void -hb_dbgAddWatch( void *handle, char *szExpr, BOOL bTrace ) +void hb_dbgAddWatch( void *handle, char *szExpr, BOOL bTrace ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; HB_WATCHPOINT *pWatch; @@ -829,8 +795,7 @@ hb_dbgAddWatch( void *handle, char *szExpr, BOOL bTrace ) } -static void -hb_dbgClearWatch( HB_WATCHPOINT *pWatch ) +static void hb_dbgClearWatch( HB_WATCHPOINT *pWatch ) { FREE( pWatch->szExpr ); if ( pWatch->pBlock ) @@ -850,8 +815,7 @@ hb_dbgClearWatch( HB_WATCHPOINT *pWatch ) } -HB_EXPORT void -hb_dbgDelBreak( void *handle, int nBreak ) +void hb_dbgDelBreak( void *handle, int nBreak ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; HB_BREAKPOINT *pBreak = &info->aBreak[ nBreak ]; @@ -865,8 +829,7 @@ hb_dbgDelBreak( void *handle, int nBreak ) } -HB_EXPORT void -hb_dbgDelWatch( void *handle, int nWatch ) +void hb_dbgDelWatch( void *handle, int nWatch ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; HB_WATCHPOINT *pWatch = &info->aWatch[ nWatch ]; @@ -896,8 +859,7 @@ hb_dbgDelWatch( void *handle, int nWatch ) } -static void -hb_dbgEndProc( HB_DEBUGINFO *info ) +static void hb_dbgEndProc( HB_DEBUGINFO *info ) { HB_CALLSTACKINFO *top; @@ -923,8 +885,7 @@ hb_dbgEndProc( HB_DEBUGINFO *info ) } -static BOOL -hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 ) +static BOOL hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 ) { if ( HB_ITEM_TYPE( pItem1 ) != HB_ITEM_TYPE( pItem2 ) ) return FALSE; @@ -948,8 +909,7 @@ hb_dbgEqual( PHB_ITEM pItem1, PHB_ITEM pItem2 ) } -static PHB_ITEM -hb_dbgEval( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ) +static PHB_ITEM hb_dbgEval( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ) { PHB_ITEM xResult = NULL; @@ -1004,8 +964,7 @@ hb_dbgEval( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ) } -static PHB_ITEM -hb_dbgEvalMacro( char *szExpr, PHB_ITEM pItem ) +static PHB_ITEM hb_dbgEvalMacro( char *szExpr, PHB_ITEM pItem ) { PHB_ITEM pStr; const char *type; @@ -1028,8 +987,7 @@ hb_dbgEvalMacro( char *szExpr, PHB_ITEM pItem ) #define IS_IDENT_START( c ) ( isalpha( (UCHAR) (c) ) || (c) == '_' ) #define IS_IDENT_CHAR( c ) ( IS_IDENT_START( (c) ) || isdigit( (UCHAR) (c) ) ) -static int -hb_dbgEvalSubstituteVar( HB_WATCHPOINT *watch, char *szWord, int nStart, int nLen ) +static int hb_dbgEvalSubstituteVar( HB_WATCHPOINT *watch, char *szWord, int nStart, int nLen ) { int j; char *t; @@ -1063,8 +1021,7 @@ hb_dbgEvalSubstituteVar( HB_WATCHPOINT *watch, char *szWord, int nStart, int nLe } -static PHB_ITEM -hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch ) +static PHB_ITEM hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch ) { int i = 0; PHB_ITEM pBlock; @@ -1227,8 +1184,7 @@ hb_dbgEvalMakeBlock( HB_WATCHPOINT *watch ) } -static PHB_ITEM -hb_dbgEvalResolve( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ) +static PHB_ITEM hb_dbgEvalResolve( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ) { int i; HB_CALLSTACKINFO *top = &info->aCallStack[ info->nCallStackLen - 1 ]; @@ -1356,8 +1312,7 @@ hb_dbgEvalResolve( HB_DEBUGINFO *info, HB_WATCHPOINT *watch ) } -HB_EXPORT PHB_ITEM -hb_dbgGetExpressionValue( void *handle, char *expression ) +PHB_ITEM hb_dbgGetExpressionValue( void *handle, char *expression ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; PHB_ITEM result; @@ -1375,8 +1330,7 @@ hb_dbgGetExpressionValue( void *handle, char *expression ) } -HB_EXPORT PHB_ITEM -hb_dbgGetSourceFiles( void *handle ) +PHB_ITEM hb_dbgGetSourceFiles( void *handle ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; int nModules = hb_itemSize( info->pStopLines ); @@ -1391,8 +1345,7 @@ hb_dbgGetSourceFiles( void *handle ) } -HB_EXPORT PHB_ITEM -hb_dbgGetWatchValue( void *handle, int nWatch ) +PHB_ITEM hb_dbgGetWatchValue( void *handle, int nWatch ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; @@ -1400,8 +1353,7 @@ hb_dbgGetWatchValue( void *handle, int nWatch ) } -static BOOL -hb_dbgIsAltD( void ) +static BOOL hb_dbgIsAltD( void ) { char szName[ HB_SYMBOL_NAME_LEN + HB_SYMBOL_NAME_LEN + 5]; @@ -1410,8 +1362,7 @@ hb_dbgIsAltD( void ) } -static BOOL -hb_dbgIsBreakPoint( HB_DEBUGINFO *info, char *szModule, int nLine ) +static BOOL hb_dbgIsBreakPoint( HB_DEBUGINFO *info, char *szModule, int nLine ) { int i; @@ -1427,8 +1378,7 @@ hb_dbgIsBreakPoint( HB_DEBUGINFO *info, char *szModule, int nLine ) } -HB_EXPORT BOOL -hb_dbgIsValidStopLine( void *handle, char *szModule, int nLine ) +BOOL hb_dbgIsValidStopLine( void *handle, char *szModule, int nLine ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; int nModules = hb_itemSize( info->pStopLines ); @@ -1454,8 +1404,7 @@ hb_dbgIsValidStopLine( void *handle, char *szModule, int nLine ) } -static void -hb_dbgQuit( HB_DEBUGINFO *info ) +static void hb_dbgQuit( HB_DEBUGINFO *info ) { while ( info->nWatchPoints ) { @@ -1495,8 +1444,7 @@ hb_dbgQuit( HB_DEBUGINFO *info ) } -HB_EXPORT void -hb_dbgSetCBTrace( void *handle, BOOL bCBTrace ) +void hb_dbgSetCBTrace( void *handle, BOOL bCBTrace ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; @@ -1504,8 +1452,7 @@ hb_dbgSetCBTrace( void *handle, BOOL bCBTrace ) } -HB_EXPORT void -hb_dbgSetGo( void *handle ) +void hb_dbgSetGo( void *handle ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; @@ -1513,8 +1460,7 @@ hb_dbgSetGo( void *handle ) } -HB_EXPORT void -hb_dbgSetInvoke( void *handle, BOOL ( *pFunInvoke )( void ) ) +void hb_dbgSetInvoke( void *handle, BOOL ( *pFunInvoke )( void ) ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; @@ -1522,8 +1468,7 @@ hb_dbgSetInvoke( void *handle, BOOL ( *pFunInvoke )( void ) ) } -HB_EXPORT void -hb_dbgSetNextRoutine( void *handle ) +void hb_dbgSetNextRoutine( void *handle ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; @@ -1531,8 +1476,7 @@ hb_dbgSetNextRoutine( void *handle ) } -HB_EXPORT void -hb_dbgSetQuit( void *handle ) +void hb_dbgSetQuit( void *handle ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; @@ -1540,8 +1484,7 @@ hb_dbgSetQuit( void *handle ) } -HB_EXPORT void -hb_dbgSetToCursor( void *handle, char *szModule, int nLine ) +void hb_dbgSetToCursor( void *handle, char *szModule, int nLine ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; @@ -1551,8 +1494,7 @@ hb_dbgSetToCursor( void *handle, char *szModule, int nLine ) } -HB_EXPORT void -hb_dbgSetTrace( void *handle ) +void hb_dbgSetTrace( void *handle ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; @@ -1561,8 +1503,7 @@ hb_dbgSetTrace( void *handle ) } -HB_EXPORT void -hb_dbgSetWatch( void *handle, int nWatch, char *szExpr, BOOL bTrace ) +void hb_dbgSetWatch( void *handle, int nWatch, char *szExpr, BOOL bTrace ) { HB_DEBUGINFO *info = (HB_DEBUGINFO *)handle; HB_WATCHPOINT *pWatch = &info->aWatch[ nWatch ]; @@ -1595,8 +1536,7 @@ hb_dbgSetWatch( void *handle, int nWatch, char *szExpr, BOOL bTrace ) } -static PHB_ITEM -hb_dbgVarGet( HB_VARINFO *scope ) +static PHB_ITEM hb_dbgVarGet( HB_VARINFO *scope ) { switch ( scope->cType ) { @@ -1635,8 +1575,7 @@ hb_dbgVarGet( HB_VARINFO *scope ) } -static void -hb_dbgVarSet( HB_VARINFO *scope, PHB_ITEM xNewValue ) +static void hb_dbgVarSet( HB_VARINFO *scope, PHB_ITEM xNewValue ) { switch ( scope->cType ) { diff --git a/harbour/source/main/harbour.c b/harbour/source/main/harbour.c index effd227a25..744ca248f7 100644 --- a/harbour/source/main/harbour.c +++ b/harbour/source/main/harbour.c @@ -359,7 +359,7 @@ static int s_iDirCase = HB_SET_CASE_MIXED; static BOOL s_fFnTrim = FALSE; static char s_cDirSep = HB_OS_PATH_DELIM_CHR; -HB_EXPORT BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) +BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) { if( s_fFnTrim || s_cDirSep != HB_OS_PATH_DELIM_CHR || s_iFileCase != HB_SET_CASE_MIXED || s_iDirCase != HB_SET_CASE_MIXED ) @@ -451,7 +451,7 @@ HB_EXPORT BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) return szFileName; } -HB_EXPORT int hb_setGetDirSeparator( void ) +int hb_setGetDirSeparator( void ) { return s_cDirSep; } diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index ada2f74398..823c7be4d6 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -925,7 +925,7 @@ static void hb_dbfGetLockArray( DBFAREAP pArea, PHB_ITEM pItem ) * This function is common for different DBF based RDD implementation * so I don't make it static */ -HB_EXPORT ERRCODE hb_dbfGetEGcode( ERRCODE errCode ) +ERRCODE hb_dbfGetEGcode( ERRCODE errCode ) { ERRCODE errEGcode; @@ -983,7 +983,7 @@ HB_EXPORT ERRCODE hb_dbfGetEGcode( ERRCODE errCode ) * This function is common for different MEMO implementation * so I left it in DBF. */ -HB_EXPORT ULONG hb_dbfGetMemoBlock( DBFAREAP pArea, USHORT uiIndex ) +ULONG hb_dbfGetMemoBlock( DBFAREAP pArea, USHORT uiIndex ) { ULONG ulBlock= 0; @@ -1016,7 +1016,7 @@ HB_EXPORT ULONG hb_dbfGetMemoBlock( DBFAREAP pArea, USHORT uiIndex ) * This function is common for different MEMO implementation * so I left it in DBF. */ -HB_EXPORT void hb_dbfPutMemoBlock( DBFAREAP pArea, USHORT uiIndex, ULONG ulBlock ) +void hb_dbfPutMemoBlock( DBFAREAP pArea, USHORT uiIndex, ULONG ulBlock ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfPutMemoBlock(%p, %hu, %lu)", pArea, uiIndex, ulBlock)); @@ -1048,7 +1048,7 @@ HB_EXPORT void hb_dbfPutMemoBlock( DBFAREAP pArea, USHORT uiIndex, ULONG ulBlock * This function is common for different MEMO implementation * so I left it in DBF. */ -HB_EXPORT ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex, +ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex, ULONG * pulBlock, ULONG * pulSize, ULONG * pulType ) { @@ -1128,7 +1128,7 @@ HB_EXPORT ERRCODE hb_dbfGetMemoData( DBFAREAP pArea, USHORT uiIndex, * This function is common for different MEMO implementation * so I left it in DBF. */ -HB_EXPORT ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex, +ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex, ULONG ulBlock, ULONG ulSize, ULONG ulType ) { HB_TRACE(HB_TR_DEBUG, ("hb_dbfSetMemoData(%p, %hu, %lu, %lu, %lu)", pArea, uiIndex, ulBlock, ulSize, ulType)); @@ -1183,7 +1183,7 @@ HB_EXPORT ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex, * This function is common for different MEMO implementation * so I left it in DBF. */ -HB_EXPORT BOOL hb_dbfLockIdxGetData( BYTE bScheme, HB_FOFFSET *ulPos, HB_FOFFSET *ulPool ) +BOOL hb_dbfLockIdxGetData( BYTE bScheme, HB_FOFFSET *ulPos, HB_FOFFSET *ulPool ) { switch( bScheme ) { @@ -1225,7 +1225,7 @@ HB_EXPORT BOOL hb_dbfLockIdxGetData( BYTE bScheme, HB_FOFFSET *ulPos, HB_FOFFSET * This function is common for different MEMO implementation * so I left it in DBF. */ -HB_EXPORT BOOL hb_dbfLockIdxFile( PHB_FILE pFile, BYTE bScheme, USHORT usMode, HB_FOFFSET *pPoolPos ) +BOOL hb_dbfLockIdxFile( PHB_FILE pFile, BYTE bScheme, USHORT usMode, HB_FOFFSET *pPoolPos ) { HB_FOFFSET ulPos, ulPool, ulSize = 1; BOOL fRet = FALSE; @@ -4272,7 +4272,7 @@ static ERRCODE hb_dbfPack( DBFAREAP pArea ) } #ifndef HB_CDP_SUPPORT_OFF -HB_EXPORT void hb_dbfTranslateRec( DBFAREAP pArea, BYTE * pBuffer, PHB_CODEPAGE cdp_src, PHB_CODEPAGE cdp_dest ) +void hb_dbfTranslateRec( DBFAREAP pArea, BYTE * pBuffer, PHB_CODEPAGE cdp_src, PHB_CODEPAGE cdp_dest ) { USHORT uiIndex; LPFIELD pField; diff --git a/harbour/source/rdd/nulsys/nulsys.c b/harbour/source/rdd/nulsys/nulsys.c index 946005b4a2..40d97c8f59 100644 --- a/harbour/source/rdd/nulsys/nulsys.c +++ b/harbour/source/rdd/nulsys/nulsys.c @@ -54,33 +54,33 @@ #include "hbapi.h" #include "hbapirdd.h" -HB_EXPORT ERRCODE hb_rddSelectWorkAreaAlias( const char * szName ) +ERRCODE hb_rddSelectWorkAreaAlias( const char * szName ) { HB_SYMBOL_UNUSED( szName ); return FAILURE; } -HB_EXPORT ERRCODE hb_rddSelectWorkAreaNumber( int iArea ) +ERRCODE hb_rddSelectWorkAreaNumber( int iArea ) { HB_SYMBOL_UNUSED( iArea ); return FAILURE; } -HB_EXPORT ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) +ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) { HB_SYMBOL_UNUSED( pSymAlias ); return FAILURE; } -HB_EXPORT int hb_rddGetCurrentWorkAreaNumber( void ) +int hb_rddGetCurrentWorkAreaNumber( void ) { return 0; } -HB_EXPORT ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { HB_SYMBOL_UNUSED( pItem ); HB_SYMBOL_UNUSED( pFieldSymbol ); @@ -88,7 +88,7 @@ HB_EXPORT ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) return FAILURE; } -HB_EXPORT ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { HB_SYMBOL_UNUSED( pItem ); HB_SYMBOL_UNUSED( pFieldSymbol ); @@ -96,7 +96,7 @@ HB_EXPORT ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) return FAILURE; } -HB_EXPORT ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { HB_SYMBOL_UNUSED( pItem ); HB_SYMBOL_UNUSED( pFieldSymbol ); @@ -104,7 +104,7 @@ HB_EXPORT ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol return FAILURE; } -HB_EXPORT ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { HB_SYMBOL_UNUSED( pItem ); HB_SYMBOL_UNUSED( pFieldSymbol ); @@ -112,7 +112,7 @@ HB_EXPORT ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol return FAILURE; } -HB_EXPORT ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) +ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) { HB_SYMBOL_UNUSED( szAlias ); HB_SYMBOL_UNUSED( iArea ); @@ -120,9 +120,9 @@ HB_EXPORT ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) return FAILURE; } -HB_EXPORT void hb_rddCloseAll( void ) {} +void hb_rddCloseAll( void ) {} -HB_EXPORT void hb_rddShutDown( void ) {} +void hb_rddShutDown( void ) {} HB_FUNC( RDDSYS ) {} diff --git a/harbour/source/rdd/wacore.c b/harbour/source/rdd/wacore.c index f5c5a72938..a27dddba05 100644 --- a/harbour/source/rdd/wacore.c +++ b/harbour/source/rdd/wacore.c @@ -166,7 +166,7 @@ static void hb_waNodeDelete( PHB_STACKRDD pRddInfo ) /* * Return the next free WorkArea for later use. */ -HB_EXPORT ERRCODE hb_rddSelectFirstAvailable( void ) +ERRCODE hb_rddSelectFirstAvailable( void ) { PHB_STACKRDD pRddInfo; USHORT uiArea; @@ -191,7 +191,7 @@ HB_EXPORT ERRCODE hb_rddSelectFirstAvailable( void ) /* * Creare and insert the new WorkArea node */ -HB_EXPORT USHORT hb_rddInsertAreaNode( const char *szDriver ) +USHORT hb_rddInsertAreaNode( const char *szDriver ) { PHB_STACKRDD pRddInfo; LPRDDNODE pRddNode; @@ -227,7 +227,7 @@ HB_EXPORT USHORT hb_rddInsertAreaNode( const char *szDriver ) * Closes and releases the current WorkArea preparing it * to be used with a new database. */ -HB_EXPORT void hb_rddReleaseCurrentArea( void ) +void hb_rddReleaseCurrentArea( void ) { PHB_STACKRDD pRddInfo; AREAP pArea; @@ -250,7 +250,7 @@ HB_EXPORT void hb_rddReleaseCurrentArea( void ) /* * Closes all WorkAreas. */ -HB_EXPORT void hb_rddCloseAll( void ) +void hb_rddCloseAll( void ) { PHB_STACKRDD pRddInfo; @@ -301,7 +301,7 @@ HB_EXPORT void hb_rddCloseAll( void ) } } -HB_EXPORT void hb_rddFlushAll( void ) +void hb_rddFlushAll( void ) { PHB_STACKRDD pRddInfo = hb_stackRDD(); USHORT uiArea = hb_rddGetCurrentWorkAreaNumber(), uiIndex; @@ -314,7 +314,7 @@ HB_EXPORT void hb_rddFlushAll( void ) hb_rddSelectWorkAreaNumber( uiArea ); } -HB_EXPORT void hb_rddUnLockAll( void ) +void hb_rddUnLockAll( void ) { PHB_STACKRDD pRddInfo = hb_stackRDD(); USHORT uiArea = hb_rddGetCurrentWorkAreaNumber(), uiIndex; @@ -330,7 +330,7 @@ HB_EXPORT void hb_rddUnLockAll( void ) /* * call a pCallBack function with all open workareas ### */ -HB_EXPORT ERRCODE hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo ) +ERRCODE hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo ) { PHB_STACKRDD pRddInfo; ERRCODE errCode = SUCCESS; @@ -348,12 +348,12 @@ HB_EXPORT ERRCODE hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo ) return errCode; } -HB_EXPORT BOOL hb_rddGetNetErr( void ) +BOOL hb_rddGetNetErr( void ) { return hb_stackRDD()->fNetError; } -HB_EXPORT void hb_rddSetNetErr( BOOL fNetErr ) +void hb_rddSetNetErr( BOOL fNetErr ) { hb_stackRDD()->fNetError = fNetErr; } @@ -361,7 +361,7 @@ HB_EXPORT void hb_rddSetNetErr( BOOL fNetErr ) /* * Get (/set) default RDD driver */ -HB_EXPORT const char * hb_rddDefaultDrv( const char * szDriver ) +const char * hb_rddDefaultDrv( const char * szDriver ) { PHB_STACKRDD pRddInfo = hb_stackRDD(); @@ -398,7 +398,7 @@ HB_EXPORT const char * hb_rddDefaultDrv( const char * szDriver ) /* * Function for getting given workarea pointer */ -HB_EXPORT void * hb_rddGetWorkAreaPointer( int iArea ) +void * hb_rddGetWorkAreaPointer( int iArea ) { PHB_STACKRDD pRddInfo; @@ -417,7 +417,7 @@ HB_EXPORT void * hb_rddGetWorkAreaPointer( int iArea ) /* * Function for getting current workarea pointer */ -HB_EXPORT void * hb_rddGetCurrentWorkAreaPointer( void ) +void * hb_rddGetCurrentWorkAreaPointer( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_rddGetCurrentWorkAreaPointer()")); @@ -427,7 +427,7 @@ HB_EXPORT void * hb_rddGetCurrentWorkAreaPointer( void ) /* * Return the current WorkArea number. */ -HB_EXPORT int hb_rddGetCurrentWorkAreaNumber( void ) +int hb_rddGetCurrentWorkAreaNumber( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_rddGetCurrentWorkAreaNumber()")); @@ -437,7 +437,7 @@ HB_EXPORT int hb_rddGetCurrentWorkAreaNumber( void ) /* * Select a WorkArea by the number. */ -HB_EXPORT ERRCODE hb_rddSelectWorkAreaNumber( int iArea ) +ERRCODE hb_rddSelectWorkAreaNumber( int iArea ) { PHB_STACKRDD pRddInfo; @@ -500,7 +500,7 @@ void hb_rddCloseDetachedAreas( void ) hb_itemRelease( pDetachedArea ); } -HB_EXPORT ERRCODE hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo ) +ERRCODE hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo ) { AREAP * pHolder; PHB_ITEM pDetachedArea; @@ -563,7 +563,7 @@ HB_EXPORT ERRCODE hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo ) return SUCCESS; } -HB_EXPORT AREAP hb_rddRequestArea( char * szAlias, PHB_ITEM pCargo, +AREAP hb_rddRequestArea( char * szAlias, PHB_ITEM pCargo, BOOL fNewArea, BOOL fWait ) { PHB_DYNS pSymAlias = NULL; diff --git a/harbour/source/rdd/wafunc.c b/harbour/source/rdd/wafunc.c index 2eb716213b..2aab502c08 100644 --- a/harbour/source/rdd/wafunc.c +++ b/harbour/source/rdd/wafunc.c @@ -61,7 +61,7 @@ /* * check if a given name can be used as alias expression */ -HB_EXPORT ERRCODE hb_rddVerifyAliasName( const char * szAlias ) +ERRCODE hb_rddVerifyAliasName( const char * szAlias ) { char c; @@ -101,7 +101,7 @@ HB_EXPORT ERRCODE hb_rddVerifyAliasName( const char * szAlias ) /* * Prepares a new WorkArea node. */ -HB_EXPORT void * hb_rddNewAreaNode( LPRDDNODE pRddNode, USHORT uiRddID ) +void * hb_rddNewAreaNode( LPRDDNODE pRddNode, USHORT uiRddID ) { AREAP pArea; @@ -147,7 +147,7 @@ HB_EXPORT void * hb_rddNewAreaNode( LPRDDNODE pRddNode, USHORT uiRddID ) return ( void * ) pArea; } -HB_EXPORT ERRCODE hb_rddGetTempAlias( char * szAliasTmp ) +ERRCODE hb_rddGetTempAlias( char * szAliasTmp ) { int i, iArea; @@ -164,7 +164,7 @@ HB_EXPORT ERRCODE hb_rddGetTempAlias( char * szAliasTmp ) /* * allocate and return atomAlias for new workarea or NULL if alias already exist */ -HB_EXPORT void * hb_rddAllocWorkAreaAlias( const char * szAlias, int iArea ) +void * hb_rddAllocWorkAreaAlias( const char * szAlias, int iArea ) { PHB_DYNS pSymAlias; int iDummyArea; @@ -205,7 +205,7 @@ HB_EXPORT void * hb_rddAllocWorkAreaAlias( const char * szAlias, int iArea ) /* * Find a field index by name */ -HB_EXPORT USHORT hb_rddFieldIndex( AREAP pArea, const char * szName ) +USHORT hb_rddFieldIndex( AREAP pArea, const char * szName ) { USHORT uiCount = 0; LPFIELD pField; @@ -238,7 +238,7 @@ HB_EXPORT USHORT hb_rddFieldIndex( AREAP pArea, const char * szName ) * find a field expression index, this function strips _FIELD->, FIELD->, * alias-> prefixes */ -HB_EXPORT USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField ) +USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField ) { int n; @@ -305,7 +305,7 @@ HB_EXPORT USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField ) /* * Find a WorkArea by the alias, return FAILURE if not found */ -HB_EXPORT ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) +ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) { BOOL fOneLetter; char c; @@ -353,7 +353,7 @@ HB_EXPORT ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea ) /* * Select a WorkArea by the symbol name. */ -HB_EXPORT ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) +ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) { HB_ITEM_PTR pError; ERRCODE errCode; @@ -419,7 +419,7 @@ HB_EXPORT ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias ) /* * Select a WorkArea by the name. */ -HB_EXPORT ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias ) +ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias ) { ERRCODE errCode; int iArea; @@ -461,7 +461,7 @@ HB_EXPORT ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias ) /* * Obtain the current value of a field. */ -HB_EXPORT ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { AREAP pArea; @@ -490,7 +490,7 @@ HB_EXPORT ERRCODE hb_rddFieldGet( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) /* * Assign a value to a field. */ -HB_EXPORT ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { AREAP pArea; @@ -519,7 +519,7 @@ HB_EXPORT ERRCODE hb_rddFieldPut( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) /* * Obtain the current value of a field. */ -HB_EXPORT ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { ERRCODE errCode; @@ -552,7 +552,7 @@ HB_EXPORT ERRCODE hb_rddGetFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol /* * Assign a value to a field. */ -HB_EXPORT ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) +ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol ) { ERRCODE errCode; diff --git a/harbour/source/rdd/workarea.c b/harbour/source/rdd/workarea.c index ca659dc156..9b3d0d8c1c 100644 --- a/harbour/source/rdd/workarea.c +++ b/harbour/source/rdd/workarea.c @@ -2026,14 +2026,14 @@ static USHORT s_uiRddCount = 0; /* Number of registered RDD */ /* * Get RDD node poionter */ -HB_EXPORT LPRDDNODE hb_rddGetNode( USHORT uiNode ) +LPRDDNODE hb_rddGetNode( USHORT uiNode ) { HB_TRACE(HB_TR_DEBUG, ("hb_rddGetNode(%hu)", uiNode)); return uiNode < s_uiRddCount ? s_RddList[ uiNode ] : NULL; } -HB_EXPORT PHB_ITEM hb_rddList( USHORT uiType ) +PHB_ITEM hb_rddList( USHORT uiType ) { USHORT uiCount, uiIndex, uiRdds; PHB_ITEM pRddArray; @@ -2059,7 +2059,7 @@ HB_EXPORT PHB_ITEM hb_rddList( USHORT uiType ) /* * Find a RDD node. */ -HB_EXPORT LPRDDNODE hb_rddFindNode( const char * szDriver, USHORT * uiIndex ) +LPRDDNODE hb_rddFindNode( const char * szDriver, USHORT * uiIndex ) { USHORT uiCount; @@ -2083,7 +2083,7 @@ HB_EXPORT LPRDDNODE hb_rddFindNode( const char * szDriver, USHORT * uiIndex ) /* * Shutdown the RDD system. */ -HB_EXPORT void hb_rddShutDown( void ) +void hb_rddShutDown( void ) { USHORT uiCount; @@ -2110,7 +2110,7 @@ HB_EXPORT void hb_rddShutDown( void ) /* * Register a RDD driver. */ -HB_EXPORT int hb_rddRegister( const char * szDriver, USHORT uiType ) +int hb_rddRegister( const char * szDriver, USHORT uiType ) { LPRDDNODE pRddNewNode; PHB_DYNS pGetFuncTable; @@ -2185,7 +2185,7 @@ HB_EXPORT int hb_rddRegister( const char * szDriver, USHORT uiType ) * pSuperTable - a current table in a RDDNODE * szDrvName - a driver name that will be inherited */ -HB_EXPORT ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNCS * pSuperTable, const char * szDrvName ) +ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNCS * pSuperTable, const char * szDrvName ) { LPRDDNODE pRddNode; USHORT uiCount; diff --git a/harbour/source/rtl/cdpapi.c b/harbour/source/rtl/cdpapi.c index e694c78089..0b05b2c364 100644 --- a/harbour/source/rtl/cdpapi.c +++ b/harbour/source/rtl/cdpapi.c @@ -292,7 +292,7 @@ static int hb_cdpFindPos( const char *pszID ) return -1; } -HB_EXPORT BOOL hb_cdpRegister( PHB_CODEPAGE cdpage ) +BOOL hb_cdpRegister( PHB_CODEPAGE cdpage ) { HB_TRACE( HB_TR_DEBUG, ( "hb_cdpRegister(%p)", cdpage ) ); @@ -445,7 +445,7 @@ HB_EXPORT BOOL hb_cdpRegister( PHB_CODEPAGE cdpage ) return FALSE; } -HB_EXPORT PHB_CODEPAGE hb_cdpFind( const char *pszID ) +PHB_CODEPAGE hb_cdpFind( const char *pszID ) { int iPos; @@ -456,7 +456,7 @@ HB_EXPORT PHB_CODEPAGE hb_cdpFind( const char *pszID ) return ( iPos != -1 ) ? s_cdpList[iPos] : NULL; } -HB_EXPORT PHB_CODEPAGE hb_cdpSelect( PHB_CODEPAGE cdpage ) +PHB_CODEPAGE hb_cdpSelect( PHB_CODEPAGE cdpage ) { PHB_CODEPAGE cdpOld; @@ -469,7 +469,7 @@ HB_EXPORT PHB_CODEPAGE hb_cdpSelect( PHB_CODEPAGE cdpage ) return cdpOld; } -HB_EXPORT char * hb_cdpID( void ) +char * hb_cdpID( void ) { PHB_CODEPAGE cdp; @@ -480,7 +480,7 @@ HB_EXPORT char * hb_cdpID( void ) return cdp ? ( char * ) cdp->id : NULL; } -HB_EXPORT char * hb_cdpSelectID( const char *pszID ) +char * hb_cdpSelectID( const char *pszID ) { char *pszIDOld; @@ -492,7 +492,7 @@ HB_EXPORT char * hb_cdpSelectID( const char *pszID ) return pszIDOld; } -HB_EXPORT void hb_cdpTranslate( char *psz, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut ) +void hb_cdpTranslate( char *psz, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut ) { if( cdpIn != cdpOut && cdpIn->nChars == cdpOut->nChars ) { @@ -534,7 +534,7 @@ HB_EXPORT void hb_cdpTranslate( char *psz, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpO } } -HB_EXPORT void hb_cdpnTranslate( char *psz, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut, ULONG nChars ) +void hb_cdpnTranslate( char *psz, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdpOut, ULONG nChars ) { if( cdpIn != cdpOut && cdpIn->nChars == cdpOut->nChars ) { @@ -576,7 +576,7 @@ HB_EXPORT void hb_cdpnTranslate( char *psz, PHB_CODEPAGE cdpIn, PHB_CODEPAGE cdp } } -HB_EXPORT USHORT hb_cdpGetU16( PHB_CODEPAGE cdp, BOOL fCtrl, BYTE ch ) +USHORT hb_cdpGetU16( PHB_CODEPAGE cdp, BOOL fCtrl, BYTE ch ) { USHORT u; @@ -592,7 +592,7 @@ HB_EXPORT USHORT hb_cdpGetU16( PHB_CODEPAGE cdp, BOOL fCtrl, BYTE ch ) return u; } -HB_EXPORT UCHAR hb_cdpGetChar( PHB_CODEPAGE cdp, BOOL fCtrl, USHORT uc ) +UCHAR hb_cdpGetChar( PHB_CODEPAGE cdp, BOOL fCtrl, USHORT uc ) { if( ( fCtrl || uc >= 32 ) && cdp && cdp->uniTable && cdp->uniTable->uniCodes ) { @@ -610,7 +610,7 @@ HB_EXPORT UCHAR hb_cdpGetChar( PHB_CODEPAGE cdp, BOOL fCtrl, USHORT uc ) return uc >= 0x100 ? '?' : ( UCHAR ) uc; } -HB_EXPORT BYTE *hb_cdpUTF8StringSubstr( const BYTE * pSrc, ULONG ulLen, +BYTE *hb_cdpUTF8StringSubstr( const BYTE * pSrc, ULONG ulLen, ULONG ulFrom, ULONG ulCount, ULONG * pulDest ) { ULONG ul, ulCnt, ulDst = 0; @@ -657,7 +657,7 @@ HB_EXPORT BYTE *hb_cdpUTF8StringSubstr( const BYTE * pSrc, ULONG ulLen, return pDst; } -HB_EXPORT ULONG hb_cdpUTF8StringPeek( const BYTE * pSrc, ULONG ulLen, ULONG ulPos ) +ULONG hb_cdpUTF8StringPeek( const BYTE * pSrc, ULONG ulLen, ULONG ulPos ) { if( ulLen ) { @@ -692,7 +692,7 @@ HB_EXPORT ULONG hb_cdpUTF8StringPeek( const BYTE * pSrc, ULONG ulLen, ULONG ulPo return 0; } -HB_EXPORT ULONG hb_cdpUTF8StringLength( const BYTE * pSrc, ULONG ulLen ) +ULONG hb_cdpUTF8StringLength( const BYTE * pSrc, ULONG ulLen ) { ULONG ul, ulDst; USHORT uc; @@ -710,7 +710,7 @@ HB_EXPORT ULONG hb_cdpUTF8StringLength( const BYTE * pSrc, ULONG ulLen ) return ulDst; } -HB_EXPORT ULONG hb_cdpStringInUTF8Length( PHB_CODEPAGE cdp, BOOL fCtrl, +ULONG hb_cdpStringInUTF8Length( PHB_CODEPAGE cdp, BOOL fCtrl, const BYTE * pSrc, ULONG ulLen ) { ULONG ul, ulDst; @@ -723,7 +723,7 @@ HB_EXPORT ULONG hb_cdpStringInUTF8Length( PHB_CODEPAGE cdp, BOOL fCtrl, return ulDst; } -HB_EXPORT ULONG hb_cdpUTF8ToStrn( PHB_CODEPAGE cdp, BOOL fCtrl, +ULONG hb_cdpUTF8ToStrn( PHB_CODEPAGE cdp, BOOL fCtrl, const BYTE * pSrc, ULONG ulSrc, BYTE * pDst, ULONG ulDst ) { @@ -765,7 +765,7 @@ HB_EXPORT ULONG hb_cdpUTF8ToStrn( PHB_CODEPAGE cdp, BOOL fCtrl, return ulD; } -HB_EXPORT BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, BYTE ch, +BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, BYTE ch, int *n, USHORT * uc ) { if( utf8tou16nextchar( ch, n, uc ) ) @@ -788,7 +788,7 @@ HB_EXPORT BOOL hb_cdpGetFromUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, BYTE ch, return FALSE; } -HB_EXPORT ULONG hb_cdpStrnToUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, +ULONG hb_cdpStrnToUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, const BYTE * pSrc, ULONG ulLen, BYTE * pDst ) { USHORT u, *uniCodes, nChars; @@ -832,7 +832,7 @@ HB_EXPORT ULONG hb_cdpStrnToUTF8( PHB_CODEPAGE cdp, BOOL fCtrl, return n; } -HB_EXPORT ULONG hb_cdpStrnToU16( PHB_CODEPAGE cdp, BOOL fCtrl, +ULONG hb_cdpStrnToU16( PHB_CODEPAGE cdp, BOOL fCtrl, const BYTE * pSrc, ULONG ulLen, BYTE * pDst ) { USHORT u, *uniCodes, nChars; @@ -874,7 +874,7 @@ HB_EXPORT ULONG hb_cdpStrnToU16( PHB_CODEPAGE cdp, BOOL fCtrl, return i << 1; } -HB_EXPORT int hb_cdpchrcmp( char cFirst, char cSecond, PHB_CODEPAGE cdpage ) +int hb_cdpchrcmp( char cFirst, char cSecond, PHB_CODEPAGE cdpage ) { int n1, n2; @@ -908,7 +908,7 @@ static int hb_cdpMultiWeight( PHB_CODEPAGE cdpage, const char *szChar ) return 0; } -HB_EXPORT int hb_cdpcmp( const char *szFirst, ULONG ulLenFirst, +int hb_cdpcmp( const char *szFirst, ULONG ulLenFirst, const char *szSecond, ULONG ulLenSecond, PHB_CODEPAGE cdpage, BOOL fExact ) { @@ -1041,7 +1041,7 @@ static int hb_cdpMultiWeightI( PHB_CODEPAGE cdpage, const char *szChar ) return 0; } -HB_EXPORT int hb_cdpicmp( const char *szFirst, ULONG ulLenFirst, +int hb_cdpicmp( const char *szFirst, ULONG ulLenFirst, const char *szSecond, ULONG ulLenSecond, PHB_CODEPAGE cdpage, BOOL fExact ) { @@ -1157,7 +1157,7 @@ HB_EXPORT int hb_cdpicmp( const char *szFirst, ULONG ulLenFirst, return iRet; } -HB_EXPORT void hb_cdpReleaseAll( void ) +void hb_cdpReleaseAll( void ) { int iPos = 0; diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c index 16412c1b03..5e608d4124 100644 --- a/harbour/source/rtl/console.c +++ b/harbour/source/rtl/console.c @@ -187,7 +187,7 @@ void hb_conRelease( void ) hb_fsSetDevMode( s_hFilenoStderr, FD_TEXT ); } -HB_EXPORT char * hb_conNewLine( void ) +char * hb_conNewLine( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_conNewLine()")); @@ -200,7 +200,7 @@ HB_FUNC( HB_OSNEWLINE ) } /* Output an item to STDOUT */ -HB_EXPORT void hb_conOutStd( const char * pStr, ULONG ulLen ) +void hb_conOutStd( const char * pStr, ULONG ulLen ) { HB_TRACE(HB_TR_DEBUG, ("hb_conOutStd(%s, %lu)", pStr, ulLen)); @@ -212,7 +212,7 @@ HB_EXPORT void hb_conOutStd( const char * pStr, ULONG ulLen ) } /* Output an item to STDERR */ -HB_EXPORT void hb_conOutErr( const char * pStr, ULONG ulLen ) +void hb_conOutErr( const char * pStr, ULONG ulLen ) { HB_TRACE(HB_TR_DEBUG, ("hb_conOutErr(%s, %lu)", pStr, ulLen)); @@ -224,7 +224,7 @@ HB_EXPORT void hb_conOutErr( const char * pStr, ULONG ulLen ) } /* Output an item to the screen and/or printer and/or alternate */ -HB_EXPORT void hb_conOutAlt( const char * pStr, ULONG ulLen ) +void hb_conOutAlt( const char * pStr, ULONG ulLen ) { HB_TRACE(HB_TR_DEBUG, ("hb_conOutAlt(%s, %lu)", pStr, ulLen)); diff --git a/harbour/source/rtl/dates.c b/harbour/source/rtl/dates.c index e600c500be..b1cc3b641e 100644 --- a/harbour/source/rtl/dates.c +++ b/harbour/source/rtl/dates.c @@ -56,7 +56,7 @@ #include "hbdate.h" #include "hbset.h" -HB_EXPORT char * hb_dateFormat( const char * szDate, char * szFormattedDate, const char * szDateFormat ) +char * hb_dateFormat( const char * szDate, char * szFormattedDate, const char * szDateFormat ) { /* * NOTE: szFormattedDate must point to a buffer of at least 11 bytes. @@ -234,7 +234,7 @@ HB_EXPORT char * hb_dateFormat( const char * szDate, char * szFormattedDate, con return szFormattedDate; } -HB_EXPORT long hb_dateUnformat( const char * szDate, const char * szDateFormat ) +long hb_dateUnformat( const char * szDate, const char * szDateFormat ) { int d_value = 0, m_value = 0, y_value = 0; diff --git a/harbour/source/rtl/errorint.c b/harbour/source/rtl/errorint.c index 720a2f4e49..ed963d1dcf 100644 --- a/harbour/source/rtl/errorint.c +++ b/harbour/source/rtl/errorint.c @@ -140,7 +140,7 @@ void hb_errInternalRaw( ULONG ulIntCode, const char * szText, const char * szPar } } -HB_EXPORT void hb_errInternal( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 ) +void hb_errInternal( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 ) { hb_errInternalRaw( ulIntCode, szText, szPar1, szPar2 ); diff --git a/harbour/source/rtl/file.c b/harbour/source/rtl/file.c index 839b63d0a4..6463e66fb3 100644 --- a/harbour/source/rtl/file.c +++ b/harbour/source/rtl/file.c @@ -53,7 +53,7 @@ #include "hbapi.h" #include "hbapifs.h" -HB_EXPORT BOOL hb_fsFile( BYTE * pFilename ) +BOOL hb_fsFile( BYTE * pFilename ) { PHB_FFIND ffind; BOOL fFree; @@ -76,7 +76,7 @@ HB_EXPORT BOOL hb_fsFile( BYTE * pFilename ) return FALSE; } -HB_EXPORT BOOL hb_fsIsDirectory( BYTE * pFilename ) +BOOL hb_fsIsDirectory( BYTE * pFilename ) { BOOL bResult = FALSE, fFree; PHB_FFIND ffind; diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 7dcd372dca..9f17464d47 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -536,7 +536,7 @@ static USHORT convert_seek_flags( USHORT uiFlags ) * filesys.api functions: */ -HB_EXPORT HB_FHANDLE hb_fsGetOsHandle( HB_FHANDLE hFileHandle ) +HB_FHANDLE hb_fsGetOsHandle( HB_FHANDLE hFileHandle ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsGetOsHandle(%p)", hFileHandle)); @@ -547,7 +547,7 @@ HB_EXPORT HB_FHANDLE hb_fsGetOsHandle( HB_FHANDLE hFileHandle ) #endif } -HB_EXPORT HB_FHANDLE hb_fsPOpen( BYTE * pFilename, BYTE * pMode ) +HB_FHANDLE hb_fsPOpen( BYTE * pFilename, BYTE * pMode ) { HB_FHANDLE hFileHandle = FS_ERROR; @@ -652,7 +652,7 @@ HB_EXPORT HB_FHANDLE hb_fsPOpen( BYTE * pFilename, BYTE * pMode ) return hFileHandle; } -HB_EXPORT HB_FHANDLE hb_fsOpen( BYTE * pFilename, USHORT uiFlags ) +HB_FHANDLE hb_fsOpen( BYTE * pFilename, USHORT uiFlags ) { HB_FHANDLE hFileHandle; BOOL fFree; @@ -712,7 +712,7 @@ HB_EXPORT HB_FHANDLE hb_fsOpen( BYTE * pFilename, USHORT uiFlags ) return hFileHandle; } -HB_EXPORT HB_FHANDLE hb_fsCreate( BYTE * pFilename, ULONG ulAttr ) +HB_FHANDLE hb_fsCreate( BYTE * pFilename, ULONG ulAttr ) { HB_FHANDLE hFileHandle; BOOL fFree; @@ -772,7 +772,7 @@ HB_EXPORT HB_FHANDLE hb_fsCreate( BYTE * pFilename, ULONG ulAttr ) [vszakats] */ -HB_EXPORT HB_FHANDLE hb_fsCreateEx( BYTE * pFilename, ULONG ulAttr, USHORT uiFlags ) +HB_FHANDLE hb_fsCreateEx( BYTE * pFilename, ULONG ulAttr, USHORT uiFlags ) { HB_FHANDLE hFileHandle; BOOL fFree; @@ -824,7 +824,7 @@ HB_EXPORT HB_FHANDLE hb_fsCreateEx( BYTE * pFilename, ULONG ulAttr, USHORT uiFla return hFileHandle; } -HB_EXPORT void hb_fsClose( HB_FHANDLE hFileHandle ) +void hb_fsClose( HB_FHANDLE hFileHandle ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsClose(%p)", hFileHandle)); @@ -845,7 +845,7 @@ HB_EXPORT void hb_fsClose( HB_FHANDLE hFileHandle ) #endif } -HB_EXPORT BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) +BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsSetDevMode(%p, %hu)", hFileHandle, uiDevMode)); @@ -926,7 +926,7 @@ HB_EXPORT BOOL hb_fsSetDevMode( HB_FHANDLE hFileHandle, USHORT uiDevMode ) #endif } -HB_EXPORT BOOL hb_fsGetFileTime( BYTE * pszFileName, LONG * plJulian, LONG * plMillisec ) +BOOL hb_fsGetFileTime( BYTE * pszFileName, LONG * plJulian, LONG * plMillisec ) { BOOL fResult; @@ -1002,7 +1002,7 @@ HB_EXPORT BOOL hb_fsGetFileTime( BYTE * pszFileName, LONG * plJulian, LONG * plM return fResult; } -HB_EXPORT BOOL hb_fsGetAttr( BYTE * pszFileName, ULONG * pulAttr ) +BOOL hb_fsGetAttr( BYTE * pszFileName, ULONG * pulAttr ) { BOOL fResult; BOOL fFree; @@ -1087,7 +1087,7 @@ HB_EXPORT BOOL hb_fsGetAttr( BYTE * pszFileName, ULONG * pulAttr ) return fResult; } -HB_EXPORT BOOL hb_fsSetFileTime( BYTE * pszFileName, LONG lJulian, LONG lMillisec ) +BOOL hb_fsSetFileTime( BYTE * pszFileName, LONG lJulian, LONG lMillisec ) { BOOL fResult; int iYear, iMonth, iDay; @@ -1256,7 +1256,7 @@ HB_EXPORT BOOL hb_fsSetFileTime( BYTE * pszFileName, LONG lJulian, LONG lMillise return fResult; } -HB_EXPORT BOOL hb_fsSetAttr( BYTE * pszFileName, ULONG ulAttr ) +BOOL hb_fsSetAttr( BYTE * pszFileName, ULONG ulAttr ) { BOOL fResult; BOOL fFree; @@ -1360,7 +1360,7 @@ HB_EXPORT BOOL hb_fsSetAttr( BYTE * pszFileName, ULONG ulAttr ) return fResult; } -HB_EXPORT USHORT hb_fsRead( HB_FHANDLE hFileHandle, BYTE * pBuff, USHORT uiCount ) +USHORT hb_fsRead( HB_FHANDLE hFileHandle, BYTE * pBuff, USHORT uiCount ) { USHORT uiRead; @@ -1400,7 +1400,7 @@ HB_EXPORT USHORT hb_fsRead( HB_FHANDLE hFileHandle, BYTE * pBuff, USHORT uiCount return uiRead; } -HB_EXPORT USHORT hb_fsWrite( HB_FHANDLE hFileHandle, const BYTE * pBuff, USHORT uiCount ) +USHORT hb_fsWrite( HB_FHANDLE hFileHandle, const BYTE * pBuff, USHORT uiCount ) { USHORT uiWritten; @@ -1460,7 +1460,7 @@ HB_EXPORT USHORT hb_fsWrite( HB_FHANDLE hFileHandle, const BYTE * pBuff, USHORT return uiWritten; } -HB_EXPORT ULONG hb_fsReadLarge( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount ) +ULONG hb_fsReadLarge( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount ) { ULONG ulRead; @@ -1540,7 +1540,7 @@ HB_EXPORT ULONG hb_fsReadLarge( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCo return ulRead; } -HB_EXPORT ULONG hb_fsWriteLarge( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULONG ulCount ) +ULONG hb_fsWriteLarge( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULONG ulCount ) { ULONG ulWritten; @@ -1642,7 +1642,7 @@ HB_EXPORT ULONG hb_fsWriteLarge( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULO return ulWritten; } -HB_EXPORT ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount, HB_FOFFSET llOffset ) +ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount, HB_FOFFSET llOffset ) { ULONG ulRead; @@ -1701,7 +1701,7 @@ HB_EXPORT ULONG hb_fsReadAt( HB_FHANDLE hFileHandle, BYTE * pBuff, ULONG ulCount return ulRead; } -HB_EXPORT ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULONG ulCount, HB_FOFFSET llOffset ) +ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULONG ulCount, HB_FOFFSET llOffset ) { ULONG ulWritten; @@ -1760,7 +1760,7 @@ HB_EXPORT ULONG hb_fsWriteAt( HB_FHANDLE hFileHandle, const BYTE * pBuff, ULONG return ulWritten; } -HB_EXPORT BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ) +BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ) { BOOL fResult; @@ -1805,7 +1805,7 @@ HB_EXPORT BOOL hb_fsTruncAt( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset ) return fResult; } -HB_EXPORT void hb_fsCommit( HB_FHANDLE hFileHandle ) +void hb_fsCommit( HB_FHANDLE hFileHandle ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsCommit(%p)", hFileHandle)); @@ -1886,7 +1886,7 @@ HB_EXPORT void hb_fsCommit( HB_FHANDLE hFileHandle ) #endif } -HB_EXPORT BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, +BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, ULONG ulLength, USHORT uiMode ) { BOOL bResult; @@ -2090,7 +2090,7 @@ HB_EXPORT BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart, return bResult; } -HB_EXPORT BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart, +BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart, HB_FOFFSET ulLength, USHORT uiMode ) { BOOL bResult; @@ -2204,7 +2204,7 @@ HB_EXPORT BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart, return bResult; } -HB_EXPORT ULONG hb_fsSeek( HB_FHANDLE hFileHandle, LONG lOffset, USHORT uiFlags ) +ULONG hb_fsSeek( HB_FHANDLE hFileHandle, LONG lOffset, USHORT uiFlags ) { ULONG ulPos; @@ -2290,7 +2290,7 @@ HB_EXPORT ULONG hb_fsSeek( HB_FHANDLE hFileHandle, LONG lOffset, USHORT uiFlags return ulPos; } -HB_EXPORT HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT uiFlags ) +HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT uiFlags ) { HB_FOFFSET llPos; @@ -2356,14 +2356,14 @@ HB_EXPORT HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset return llPos; } -HB_EXPORT ULONG hb_fsTell( HB_FHANDLE hFileHandle ) +ULONG hb_fsTell( HB_FHANDLE hFileHandle ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsTell(%p)", hFileHandle)); return hb_fsSeek( hFileHandle, 0, FS_RELATIVE ); } -HB_EXPORT BOOL hb_fsDelete( BYTE * pFilename ) +BOOL hb_fsDelete( BYTE * pFilename ) { BOOL bResult; BOOL fFree; @@ -2399,7 +2399,7 @@ HB_EXPORT BOOL hb_fsDelete( BYTE * pFilename ) return bResult; } -HB_EXPORT BOOL hb_fsRename( BYTE * pOldName, BYTE * pNewName ) +BOOL hb_fsRename( BYTE * pOldName, BYTE * pNewName ) { BOOL bResult; BOOL fFreeOld, fFreeNew; @@ -2438,7 +2438,7 @@ HB_EXPORT BOOL hb_fsRename( BYTE * pOldName, BYTE * pNewName ) return bResult; } -HB_EXPORT BOOL hb_fsMkDir( BYTE * pDirname ) +BOOL hb_fsMkDir( BYTE * pDirname ) { BOOL bResult; BOOL fFree; @@ -2482,7 +2482,7 @@ HB_EXPORT BOOL hb_fsMkDir( BYTE * pDirname ) return bResult; } -HB_EXPORT BOOL hb_fsChDir( BYTE * pDirname ) +BOOL hb_fsChDir( BYTE * pDirname ) { BOOL bResult; BOOL fFree; @@ -2518,7 +2518,7 @@ HB_EXPORT BOOL hb_fsChDir( BYTE * pDirname ) return bResult; } -HB_EXPORT BOOL hb_fsRmDir( BYTE * pDirname ) +BOOL hb_fsRmDir( BYTE * pDirname ) { BOOL bResult; BOOL fFree; @@ -2557,7 +2557,7 @@ HB_EXPORT BOOL hb_fsRmDir( BYTE * pDirname ) /* NOTE: This is not thread safe function, it's there for compatibility. */ /* NOTE: 0 = current drive, 1 = A, 2 = B, 3 = C, etc. */ -HB_EXPORT BYTE * hb_fsCurDir( USHORT uiDrive ) +BYTE * hb_fsCurDir( USHORT uiDrive ) { BYTE * pbyDirBuffer; @@ -2572,7 +2572,7 @@ HB_EXPORT BYTE * hb_fsCurDir( USHORT uiDrive ) /* NOTE: Thread safe version of hb_fsCurDir() */ /* NOTE: 0 = current drive, 1 = A, 2 = B, 3 = C, etc. */ -HB_EXPORT USHORT hb_fsCurDirBuff( USHORT uiDrive, BYTE * pbyBuffer, ULONG ulLen ) +USHORT hb_fsCurDirBuff( USHORT uiDrive, BYTE * pbyBuffer, ULONG ulLen ) { USHORT uiCurDrv = uiDrive, usError; BOOL fResult; @@ -2678,7 +2678,7 @@ HB_EXPORT USHORT hb_fsCurDirBuff( USHORT uiDrive, BYTE * pbyBuffer, ULONG ulLen /* NOTE: 0=A:, 1=B:, 2=C:, 3=D:, ... */ -HB_EXPORT USHORT hb_fsChDrv( BYTE nDrive ) +USHORT hb_fsChDrv( BYTE nDrive ) { USHORT uiResult; @@ -2726,7 +2726,7 @@ HB_EXPORT USHORT hb_fsChDrv( BYTE nDrive ) the drive before checking. hb_fsIsDrv only returns TRUE if there is a disk in the drive. */ -HB_EXPORT USHORT hb_fsIsDrv( BYTE nDrive ) +USHORT hb_fsIsDrv( BYTE nDrive ) { USHORT uiResult; @@ -2784,7 +2784,7 @@ HB_EXPORT USHORT hb_fsIsDrv( BYTE nDrive ) return uiResult; } -HB_EXPORT BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle ) +BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle ) { BOOL bResult; @@ -2821,7 +2821,7 @@ HB_EXPORT BOOL hb_fsIsDevice( HB_FHANDLE hFileHandle ) /* NOTE: 0=A:, 1=B:, 2=C:, 3=D:, ... */ -HB_EXPORT BYTE hb_fsCurDrv( void ) +BYTE hb_fsCurDrv( void ) { UINT uiResult; @@ -2846,7 +2846,7 @@ HB_EXPORT BYTE hb_fsCurDrv( void ) /* convert file name for hb_fsExtOpen * caller must free the returned buffer */ -HB_EXPORT BYTE * hb_fsExtName( BYTE * pFilename, BYTE * pDefExt, +BYTE * hb_fsExtName( BYTE * pFilename, BYTE * pDefExt, USHORT uiExFlags, BYTE * pPaths ) { HB_PATHNAMES * pNextPath; @@ -2921,7 +2921,7 @@ HB_EXPORT BYTE * hb_fsExtName( BYTE * pFilename, BYTE * pDefExt, return szPath; } -HB_EXPORT HB_FHANDLE hb_fsExtOpen( BYTE * pFilename, BYTE * pDefExt, +HB_FHANDLE hb_fsExtOpen( BYTE * pFilename, BYTE * pDefExt, USHORT uiExFlags, BYTE * pPaths, PHB_ITEM pError ) { @@ -3036,7 +3036,7 @@ HB_EXPORT HB_FHANDLE hb_fsExtOpen( BYTE * pFilename, BYTE * pDefExt, return hFile; } -HB_EXPORT BOOL hb_fsEof( HB_FHANDLE hFileHandle ) +BOOL hb_fsEof( HB_FHANDLE hFileHandle ) { BOOL fResult; @@ -3075,7 +3075,7 @@ HB_EXPORT BOOL hb_fsEof( HB_FHANDLE hFileHandle ) return fResult; } -HB_EXPORT BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) +BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) { int iFileCase, iDirCase; char cDirSep; @@ -3187,7 +3187,7 @@ HB_EXPORT BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) #ifdef HB_LEGACY_LEVEL -HB_EXPORT BYTE * hb_fileNameConv( char * szFileName ) +BYTE * hb_fileNameConv( char * szFileName ) { BOOL fFree; BYTE * szNew; diff --git a/harbour/source/rtl/fscopy.c b/harbour/source/rtl/fscopy.c index 06727ea396..88446ab033 100644 --- a/harbour/source/rtl/fscopy.c +++ b/harbour/source/rtl/fscopy.c @@ -55,7 +55,7 @@ #define HB_FSCOPY_BUFFERSIZE 16384 -HB_EXPORT BOOL hb_fsCopy( const BYTE * pSource, const BYTE * pDest ) +BOOL hb_fsCopy( const BYTE * pSource, const BYTE * pDest ) { BOOL bRetVal = TRUE; HB_FHANDLE fhndSource; diff --git a/harbour/source/rtl/fserror.c b/harbour/source/rtl/fserror.c index 7a897f2373..34c0781a34 100644 --- a/harbour/source/rtl/fserror.c +++ b/harbour/source/rtl/fserror.c @@ -177,7 +177,7 @@ static int hb_WinToDosError( ULONG ulError ) #endif /* return FERROR() code */ -HB_EXPORT USHORT hb_fsGetFError( void ) +USHORT hb_fsGetFError( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsGetFError()")); @@ -185,7 +185,7 @@ HB_EXPORT USHORT hb_fsGetFError( void ) } /* return DOS error code of last operation */ -HB_EXPORT USHORT hb_fsError( void ) +USHORT hb_fsError( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsError()")); @@ -193,7 +193,7 @@ HB_EXPORT USHORT hb_fsError( void ) } /* return real error code of last operation */ -HB_EXPORT USHORT hb_fsOsError( void ) +USHORT hb_fsOsError( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsOsError()")); @@ -201,7 +201,7 @@ HB_EXPORT USHORT hb_fsOsError( void ) } /* set FERROR() code */ -HB_EXPORT void hb_fsSetFError( USHORT uiError ) +void hb_fsSetFError( USHORT uiError ) { HB_TRACE(HB_TR_DEBUG, ("hb_fsSetFError(%hu)", uiError)); @@ -209,7 +209,7 @@ HB_EXPORT void hb_fsSetFError( USHORT uiError ) } /* set DOS error code for last operation */ -HB_EXPORT void hb_fsSetError( USHORT uiError ) +void hb_fsSetError( USHORT uiError ) { PHB_IOERRORS pIOErrors; @@ -221,7 +221,7 @@ HB_EXPORT void hb_fsSetError( USHORT uiError ) } /* set error code for last operation */ -HB_EXPORT void hb_fsSetIOError( BOOL fResult, USHORT uiOperation ) +void hb_fsSetIOError( BOOL fResult, USHORT uiOperation ) { USHORT uiOsErrorLast, uiErrorLast; PHB_IOERRORS pIOErrors; diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c index 27962a3f3c..9de27070a7 100644 --- a/harbour/source/rtl/fstemp.c +++ b/harbour/source/rtl/fstemp.c @@ -113,7 +113,7 @@ static BOOL hb_fsTempName( BYTE * pszBuffer, const BYTE * pszDir, const BYTE * p /* NOTE: The buffer must be at least _POSIX_PATH_MAX + 1 chars long */ -HB_EXPORT HB_FHANDLE hb_fsCreateTemp( const BYTE * pszDir, const BYTE * pszPrefix, ULONG ulAttr, BYTE * pszName ) +HB_FHANDLE hb_fsCreateTemp( const BYTE * pszDir, const BYTE * pszPrefix, ULONG ulAttr, BYTE * pszName ) { USHORT nAttemptLeft = 999; @@ -169,7 +169,7 @@ static BOOL fsGetTempDirByCase( BYTE *pszName, const char *pszTempDir ) return fOK; } -HB_EXPORT HB_FHANDLE hb_fsCreateTemp( const BYTE * pszDir, const BYTE * pszPrefix, ULONG ulAttr, BYTE * pszName ) +HB_FHANDLE hb_fsCreateTemp( const BYTE * pszDir, const BYTE * pszPrefix, ULONG ulAttr, BYTE * pszName ) { /* less attemps */ int iAttemptLeft = 99, iLen; diff --git a/harbour/source/rtl/gtapi.c b/harbour/source/rtl/gtapi.c index 6448b707ad..d1d0c9314b 100644 --- a/harbour/source/rtl/gtapi.c +++ b/harbour/source/rtl/gtapi.c @@ -83,7 +83,7 @@ /* gt API functions */ -HB_EXPORT ERRCODE hb_gtInit( HB_FHANDLE hFilenoStdin, HB_FHANDLE hFilenoStdout, HB_FHANDLE hFilenoStderr ) +ERRCODE hb_gtInit( HB_FHANDLE hFilenoStdin, HB_FHANDLE hFilenoStdout, HB_FHANDLE hFilenoStderr ) { PHB_GT pGT; @@ -104,7 +104,7 @@ HB_EXPORT ERRCODE hb_gtInit( HB_FHANDLE hFilenoStdin, HB_FHANDLE hFilenoStdout, return SUCCESS; } -HB_EXPORT ERRCODE hb_gtExit( void ) +ERRCODE hb_gtExit( void ) { HB_TRACE(HB_TR_DEBUG, ("hb_gtExit()")); @@ -116,7 +116,7 @@ HB_EXPORT ERRCODE hb_gtExit( void ) return SUCCESS; } -HB_EXPORT ERRCODE hb_gtLock( void ) +ERRCODE hb_gtLock( void ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -133,7 +133,7 @@ HB_EXPORT ERRCODE hb_gtLock( void ) return errCode; } -HB_EXPORT ERRCODE hb_gtUnlock( void ) +ERRCODE hb_gtUnlock( void ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -150,7 +150,7 @@ HB_EXPORT ERRCODE hb_gtUnlock( void ) return errCode; } -HB_EXPORT int hb_gtReadKey( int iEventMask ) +int hb_gtReadKey( int iEventMask ) { int iKey = 0; PHB_GT pGT; @@ -166,7 +166,7 @@ HB_EXPORT int hb_gtReadKey( int iEventMask ) return iKey; } -HB_EXPORT ERRCODE hb_gtBox( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right, BYTE * pbyFrame ) +ERRCODE hb_gtBox( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right, BYTE * pbyFrame ) { PHB_GT pGT; @@ -184,7 +184,7 @@ HB_EXPORT ERRCODE hb_gtBox( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right, BY return FAILURE; } -HB_EXPORT ERRCODE hb_gtBoxD( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right ) +ERRCODE hb_gtBoxD( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right ) { PHB_GT pGT; @@ -202,7 +202,7 @@ HB_EXPORT ERRCODE hb_gtBoxD( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtBoxS( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right ) +ERRCODE hb_gtBoxS( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right ) { PHB_GT pGT; @@ -220,7 +220,7 @@ HB_EXPORT ERRCODE hb_gtBoxS( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtDrawBox( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right, BYTE * pbyFrame, int iColor ) +ERRCODE hb_gtDrawBox( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right, BYTE * pbyFrame, int iColor ) { PHB_GT pGT; @@ -240,7 +240,7 @@ HB_EXPORT ERRCODE hb_gtDrawBox( SHORT Top, SHORT Left, SHORT Bottom, SHORT Right return FAILURE; } -HB_EXPORT ERRCODE hb_gtColorSelect( USHORT uiColorIndex ) +ERRCODE hb_gtColorSelect( USHORT uiColorIndex ) { PHB_GT pGT; @@ -256,7 +256,7 @@ HB_EXPORT ERRCODE hb_gtColorSelect( USHORT uiColorIndex ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtDispBegin( void ) +ERRCODE hb_gtDispBegin( void ) { PHB_GT pGT; @@ -272,7 +272,7 @@ HB_EXPORT ERRCODE hb_gtDispBegin( void ) return FAILURE; } -HB_EXPORT USHORT hb_gtDispCount( void ) +USHORT hb_gtDispCount( void ) { USHORT uiCount = 0; PHB_GT pGT; @@ -288,7 +288,7 @@ HB_EXPORT USHORT hb_gtDispCount( void ) return uiCount; } -HB_EXPORT ERRCODE hb_gtDispEnd( void ) +ERRCODE hb_gtDispEnd( void ) { PHB_GT pGT; @@ -305,7 +305,7 @@ HB_EXPORT ERRCODE hb_gtDispEnd( void ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtPreExt( void ) +ERRCODE hb_gtPreExt( void ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -322,7 +322,7 @@ HB_EXPORT ERRCODE hb_gtPreExt( void ) return errCode; } -HB_EXPORT ERRCODE hb_gtPostExt( void ) +ERRCODE hb_gtPostExt( void ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -344,7 +344,7 @@ HB_EXPORT ERRCODE hb_gtPostExt( void ) That seems like a 127+1 buffer size, plus lazy overflow checking. [vszakats] */ -HB_EXPORT ERRCODE hb_gtGetColorStr( char * pszColorString ) +ERRCODE hb_gtGetColorStr( char * pszColorString ) { PHB_GT pGT; @@ -361,7 +361,7 @@ HB_EXPORT ERRCODE hb_gtGetColorStr( char * pszColorString ) return FAILURE; } -HB_EXPORT int hb_gtColorToN( const char * szColorString ) +int hb_gtColorToN( const char * szColorString ) { int iColor = 0; PHB_GT pGT; @@ -377,7 +377,7 @@ HB_EXPORT int hb_gtColorToN( const char * szColorString ) return iColor; } -HB_EXPORT ERRCODE hb_gtColorsToString( int * pColors, int iColorCount, char * pszColorString, int iBufSize ) +ERRCODE hb_gtColorsToString( int * pColors, int iColorCount, char * pszColorString, int iBufSize ) { PHB_GT pGT; @@ -394,7 +394,7 @@ HB_EXPORT ERRCODE hb_gtColorsToString( int * pColors, int iColorCount, char * ps return FAILURE; } -HB_EXPORT ERRCODE hb_gtSetColorStr( const char * szColorString ) +ERRCODE hb_gtSetColorStr( const char * szColorString ) { PHB_GT pGT; @@ -410,7 +410,7 @@ HB_EXPORT ERRCODE hb_gtSetColorStr( const char * szColorString ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtGetCursor( USHORT * uipCursorStyle ) +ERRCODE hb_gtGetCursor( USHORT * uipCursorStyle ) { PHB_GT pGT; @@ -427,7 +427,7 @@ HB_EXPORT ERRCODE hb_gtGetCursor( USHORT * uipCursorStyle ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtSetCursor( USHORT uiCursorStyle ) +ERRCODE hb_gtSetCursor( USHORT uiCursorStyle ) { HB_TRACE(HB_TR_DEBUG, ("hb_gtSetCursor(%hu)", uiCursorStyle)); @@ -445,7 +445,7 @@ HB_EXPORT ERRCODE hb_gtSetCursor( USHORT uiCursorStyle ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtGetPos( SHORT * piRow, SHORT * piCol ) +ERRCODE hb_gtGetPos( SHORT * piRow, SHORT * piCol ) { PHB_GT pGT; @@ -469,7 +469,7 @@ HB_EXPORT ERRCODE hb_gtGetPos( SHORT * piRow, SHORT * piCol ) /* NOTE: Should be exactly the same as hb_gtSetPosContext(), but without the additional third parameter. */ -HB_EXPORT ERRCODE hb_gtSetPos( SHORT iRow, SHORT iCol ) +ERRCODE hb_gtSetPos( SHORT iRow, SHORT iCol ) { PHB_GT pGT; @@ -486,7 +486,7 @@ HB_EXPORT ERRCODE hb_gtSetPos( SHORT iRow, SHORT iCol ) return FAILURE; } -HB_EXPORT USHORT hb_gtMaxCol( void ) +USHORT hb_gtMaxCol( void ) { USHORT uiMaxCol = 79; PHB_GT pGT; @@ -502,7 +502,7 @@ HB_EXPORT USHORT hb_gtMaxCol( void ) return uiMaxCol; } -HB_EXPORT USHORT hb_gtMaxRow( void ) +USHORT hb_gtMaxRow( void ) { USHORT uiMaxRow = 24; PHB_GT pGT; @@ -518,7 +518,7 @@ HB_EXPORT USHORT hb_gtMaxRow( void ) return uiMaxRow; } -HB_EXPORT ERRCODE hb_gtScrDim( USHORT * uipHeight, USHORT * uipWidth ) +ERRCODE hb_gtScrDim( USHORT * uipHeight, USHORT * uipWidth ) { PHB_GT pGT; @@ -539,7 +539,7 @@ HB_EXPORT ERRCODE hb_gtScrDim( USHORT * uipHeight, USHORT * uipWidth ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtSetSnowFlag( BOOL fNoSnow ) +ERRCODE hb_gtSetSnowFlag( BOOL fNoSnow ) { PHB_GT pGT; @@ -555,7 +555,7 @@ HB_EXPORT ERRCODE hb_gtSetSnowFlag( BOOL fNoSnow ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtRectSize( int iTop, int iLeft, int iBottom, int iRight, ULONG * pulBuffSize ) +ERRCODE hb_gtRectSize( int iTop, int iLeft, int iBottom, int iRight, ULONG * pulBuffSize ) { PHB_GT pGT; @@ -572,7 +572,7 @@ HB_EXPORT ERRCODE hb_gtRectSize( int iTop, int iLeft, int iBottom, int iRight, U return FAILURE; } -HB_EXPORT BOOL hb_gtIsColor( void ) +BOOL hb_gtIsColor( void ) { BOOL fColor = TRUE; PHB_GT pGT; @@ -588,7 +588,7 @@ HB_EXPORT BOOL hb_gtIsColor( void ) return fColor; } -HB_EXPORT ERRCODE hb_gtRepChar( USHORT uiRow, USHORT uiCol, BYTE byChar, USHORT uiCount ) +ERRCODE hb_gtRepChar( USHORT uiRow, USHORT uiCol, BYTE byChar, USHORT uiCount ) { PHB_GT pGT; @@ -606,7 +606,7 @@ HB_EXPORT ERRCODE hb_gtRepChar( USHORT uiRow, USHORT uiCol, BYTE byChar, USHORT return FAILURE; } -HB_EXPORT ERRCODE hb_gtSave( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, void * pScrBuff ) +ERRCODE hb_gtSave( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, void * pScrBuff ) { PHB_GT pGT; @@ -622,7 +622,7 @@ HB_EXPORT ERRCODE hb_gtSave( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHOR return FAILURE; } -HB_EXPORT ERRCODE hb_gtRest( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, void * pScrBuff ) +ERRCODE hb_gtRest( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, void * pScrBuff ) { PHB_GT pGT; @@ -639,7 +639,7 @@ HB_EXPORT ERRCODE hb_gtRest( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHOR return FAILURE; } -HB_EXPORT ERRCODE hb_gtGetChar( USHORT uiRow, USHORT uiCol, BYTE * pbColor, BYTE * pbAttr, USHORT * pusChar ) +ERRCODE hb_gtGetChar( USHORT uiRow, USHORT uiCol, BYTE * pbColor, BYTE * pbAttr, USHORT * pusChar ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -656,7 +656,7 @@ HB_EXPORT ERRCODE hb_gtGetChar( USHORT uiRow, USHORT uiCol, BYTE * pbColor, BYTE return errCode; } -HB_EXPORT ERRCODE hb_gtPutChar( USHORT uiRow, USHORT uiCol, BYTE bColor, BYTE bAttr, USHORT usChar ) +ERRCODE hb_gtPutChar( USHORT uiRow, USHORT uiCol, BYTE bColor, BYTE bAttr, USHORT usChar ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -673,7 +673,7 @@ HB_EXPORT ERRCODE hb_gtPutChar( USHORT uiRow, USHORT uiCol, BYTE bColor, BYTE bA return errCode; } -HB_EXPORT ERRCODE hb_gtBeginWrite( void ) +ERRCODE hb_gtBeginWrite( void ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -691,7 +691,7 @@ HB_EXPORT ERRCODE hb_gtBeginWrite( void ) return errCode; } -HB_EXPORT ERRCODE hb_gtEndWrite( void ) +ERRCODE hb_gtEndWrite( void ) { PHB_GT pGT; @@ -708,7 +708,7 @@ HB_EXPORT ERRCODE hb_gtEndWrite( void ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtGetBlink( BOOL * bpBlink ) +ERRCODE hb_gtGetBlink( BOOL * bpBlink ) { PHB_GT pGT; @@ -725,7 +725,7 @@ HB_EXPORT ERRCODE hb_gtGetBlink( BOOL * bpBlink ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtSetBlink( BOOL fBlink ) +ERRCODE hb_gtSetBlink( BOOL fBlink ) { PHB_GT pGT; @@ -741,7 +741,7 @@ HB_EXPORT ERRCODE hb_gtSetBlink( BOOL fBlink ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtSetMode( USHORT uiRows, USHORT uiCols ) +ERRCODE hb_gtSetMode( USHORT uiRows, USHORT uiCols ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -758,7 +758,7 @@ HB_EXPORT ERRCODE hb_gtSetMode( USHORT uiRows, USHORT uiCols ) return errCode; } -HB_EXPORT ERRCODE hb_gtPutText( USHORT uiRow, USHORT uiCol, +ERRCODE hb_gtPutText( USHORT uiRow, USHORT uiCol, BYTE * pStr, ULONG ulLength, int iColor ) { @@ -781,7 +781,7 @@ HB_EXPORT ERRCODE hb_gtPutText( USHORT uiRow, USHORT uiCol, return FAILURE; } -HB_EXPORT ERRCODE hb_gtWriteAt( USHORT uiRow, USHORT uiCol, BYTE * pStr, ULONG ulLength ) +ERRCODE hb_gtWriteAt( USHORT uiRow, USHORT uiCol, BYTE * pStr, ULONG ulLength ) { PHB_GT pGT; @@ -798,7 +798,7 @@ HB_EXPORT ERRCODE hb_gtWriteAt( USHORT uiRow, USHORT uiCol, BYTE * pStr, ULONG u return FAILURE; } -HB_EXPORT ERRCODE hb_gtWrite( BYTE * pStr, ULONG ulLength ) +ERRCODE hb_gtWrite( BYTE * pStr, ULONG ulLength ) { PHB_GT pGT; @@ -815,7 +815,7 @@ HB_EXPORT ERRCODE hb_gtWrite( BYTE * pStr, ULONG ulLength ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtWriteCon( BYTE * pStr, ULONG ulLength ) +ERRCODE hb_gtWriteCon( BYTE * pStr, ULONG ulLength ) { PHB_GT pGT; @@ -832,7 +832,7 @@ HB_EXPORT ERRCODE hb_gtWriteCon( BYTE * pStr, ULONG ulLength ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtScroll( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, SHORT iRows, SHORT iCols ) +ERRCODE hb_gtScroll( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, SHORT iRows, SHORT iCols ) { HB_TRACE(HB_TR_DEBUG, ("hb_gtScroll(%hu, %hu, %hu, %hu, %hd, %hd)", uiTop, uiLeft, uiBottom, uiRight, iRows, iCols)); @@ -851,7 +851,7 @@ HB_EXPORT ERRCODE hb_gtScroll( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USH return FAILURE; } -HB_EXPORT ERRCODE hb_gtScrollUp( USHORT uiRows ) +ERRCODE hb_gtScrollUp( USHORT uiRows ) { HB_TRACE(HB_TR_DEBUG, ("hb_gtScrollUp(%hd)", uiRows)); @@ -869,7 +869,7 @@ HB_EXPORT ERRCODE hb_gtScrollUp( USHORT uiRows ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtDrawShadow( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, BYTE byAttr ) +ERRCODE hb_gtDrawShadow( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, BYTE byAttr ) { PHB_GT pGT; @@ -886,7 +886,7 @@ HB_EXPORT ERRCODE hb_gtDrawShadow( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, return FAILURE; } -HB_EXPORT ERRCODE hb_gtTone( double dFrequency, double dDuration ) +ERRCODE hb_gtTone( double dFrequency, double dDuration ) { PHB_GT pGT; @@ -902,7 +902,7 @@ HB_EXPORT ERRCODE hb_gtTone( double dFrequency, double dDuration ) return FAILURE; } -HB_EXPORT const char * hb_gtVersion( int iType ) +const char * hb_gtVersion( int iType ) { const char * szVersion = ""; PHB_GT pGT; @@ -918,7 +918,7 @@ HB_EXPORT const char * hb_gtVersion( int iType ) return szVersion; } -HB_EXPORT ERRCODE hb_gtSetAttribute( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, BYTE byAttr ) +ERRCODE hb_gtSetAttribute( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, BYTE byAttr ) { PHB_GT pGT; @@ -936,7 +936,7 @@ HB_EXPORT ERRCODE hb_gtSetAttribute( USHORT uiTop, USHORT uiLeft, USHORT uiBotto } /* prepare the terminal for system call */ -HB_EXPORT ERRCODE hb_gtSuspend( void ) +ERRCODE hb_gtSuspend( void ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -953,7 +953,7 @@ HB_EXPORT ERRCODE hb_gtSuspend( void ) return errCode; } -HB_EXPORT ERRCODE hb_gtResume( void ) +ERRCODE hb_gtResume( void ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -970,7 +970,7 @@ HB_EXPORT ERRCODE hb_gtResume( void ) return errCode; } -HB_EXPORT ERRCODE hb_gtOutStd( BYTE * pbyStr, ULONG ulLen ) +ERRCODE hb_gtOutStd( BYTE * pbyStr, ULONG ulLen ) { PHB_GT pGT; @@ -988,7 +988,7 @@ HB_EXPORT ERRCODE hb_gtOutStd( BYTE * pbyStr, ULONG ulLen ) return SUCCESS; } -HB_EXPORT ERRCODE hb_gtOutErr( BYTE * pbyStr, ULONG ulLen ) +ERRCODE hb_gtOutErr( BYTE * pbyStr, ULONG ulLen ) { PHB_GT pGT; @@ -1006,7 +1006,7 @@ HB_EXPORT ERRCODE hb_gtOutErr( BYTE * pbyStr, ULONG ulLen ) return SUCCESS; } -HB_EXPORT ERRCODE hb_gtSetDispCP( const char * pszTermCDP, const char * pszHostCDP, BOOL fBox ) +ERRCODE hb_gtSetDispCP( const char * pszTermCDP, const char * pszHostCDP, BOOL fBox ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -1023,7 +1023,7 @@ HB_EXPORT ERRCODE hb_gtSetDispCP( const char * pszTermCDP, const char * pszHostC return errCode; } -HB_EXPORT ERRCODE hb_gtSetKeyCP( const char * pszTermCDP, const char * pszHostCDP ) +ERRCODE hb_gtSetKeyCP( const char * pszTermCDP, const char * pszHostCDP ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -1040,7 +1040,7 @@ HB_EXPORT ERRCODE hb_gtSetKeyCP( const char * pszTermCDP, const char * pszHostCD return errCode; } -HB_EXPORT ERRCODE hb_gtInfo( int iType, PHB_GT_INFO pInfo ) +ERRCODE hb_gtInfo( int iType, PHB_GT_INFO pInfo ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -1057,7 +1057,7 @@ HB_EXPORT ERRCODE hb_gtInfo( int iType, PHB_GT_INFO pInfo ) return errCode; } -HB_EXPORT int hb_gtAlert( PHB_ITEM pMessage, PHB_ITEM pOptions, +int hb_gtAlert( PHB_ITEM pMessage, PHB_ITEM pOptions, int iClrNorm, int iClrHigh, double dDelay ) { int iResult = 0; @@ -1075,7 +1075,7 @@ HB_EXPORT int hb_gtAlert( PHB_ITEM pMessage, PHB_ITEM pOptions, return iResult; } -HB_EXPORT int hb_gtSetFlag( int iType, int iNewValue ) +int hb_gtSetFlag( int iType, int iNewValue ) { int iFlag = 0; PHB_GT pGT; @@ -1091,7 +1091,7 @@ HB_EXPORT int hb_gtSetFlag( int iType, int iNewValue ) return iFlag; } -HB_EXPORT int hb_gtGetCurrColor( void ) +int hb_gtGetCurrColor( void ) { int iColor = 0x07; PHB_GT pGT; @@ -1107,7 +1107,7 @@ HB_EXPORT int hb_gtGetCurrColor( void ) return iColor; } -HB_EXPORT int hb_gtGetClearColor( void ) +int hb_gtGetClearColor( void ) { int iColor = 0x07; PHB_GT pGT; @@ -1123,7 +1123,7 @@ HB_EXPORT int hb_gtGetClearColor( void ) return iColor; } -HB_EXPORT ERRCODE hb_gtSetClearColor( int iColor ) +ERRCODE hb_gtSetClearColor( int iColor ) { PHB_GT pGT; @@ -1139,7 +1139,7 @@ HB_EXPORT ERRCODE hb_gtSetClearColor( int iColor ) return FAILURE; } -HB_EXPORT int hb_gtGetClearChar( void ) +int hb_gtGetClearChar( void ) { int iChar = ' '; PHB_GT pGT; @@ -1155,7 +1155,7 @@ HB_EXPORT int hb_gtGetClearChar( void ) return iChar; } -HB_EXPORT ERRCODE hb_gtSetClearChar( int iChar ) +ERRCODE hb_gtSetClearChar( int iChar ) { PHB_GT pGT; @@ -1171,7 +1171,7 @@ HB_EXPORT ERRCODE hb_gtSetClearChar( int iChar ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtGetScrChar( int iRow, int iCol, BYTE * pbColor, BYTE * pbAttr, USHORT * pusChar ) +ERRCODE hb_gtGetScrChar( int iRow, int iCol, BYTE * pbColor, BYTE * pbAttr, USHORT * pusChar ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -1188,7 +1188,7 @@ HB_EXPORT ERRCODE hb_gtGetScrChar( int iRow, int iCol, BYTE * pbColor, BYTE * pb return errCode; } -HB_EXPORT ERRCODE hb_gtPutScrChar( int iRow, int iCol, BYTE bColor, BYTE bAttr, USHORT usChar ) +ERRCODE hb_gtPutScrChar( int iRow, int iCol, BYTE bColor, BYTE bAttr, USHORT usChar ) { ERRCODE errCode = FAILURE; PHB_GT pGT; @@ -1205,7 +1205,7 @@ HB_EXPORT ERRCODE hb_gtPutScrChar( int iRow, int iCol, BYTE bColor, BYTE bAttr, return errCode; } -HB_EXPORT ERRCODE hb_gtFlush( void ) +ERRCODE hb_gtFlush( void ) { PHB_GT pGT; @@ -1221,7 +1221,7 @@ HB_EXPORT ERRCODE hb_gtFlush( void ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtGetPosEx( int * piRow, int * piCol ) +ERRCODE hb_gtGetPosEx( int * piRow, int * piCol ) { PHB_GT pGT; @@ -1238,7 +1238,7 @@ HB_EXPORT ERRCODE hb_gtGetPosEx( int * piRow, int * piCol ) return FAILURE; } -HB_EXPORT ERRCODE hb_gtScrollEx( int iTop, int iLeft, int iBottom, int iRight, int iColor, int iChar, int iRows, int iCols ) +ERRCODE hb_gtScrollEx( int iTop, int iLeft, int iBottom, int iRight, int iColor, int iChar, int iRows, int iCols ) { HB_TRACE(HB_TR_DEBUG, ("hb_gtScrollEx(%d, %d, %d, %d, %d, %hd, %d, %d)", iTop, iLeft, iBottom, iRight, iColor, iChar, iRows, iCols)); @@ -1261,7 +1261,7 @@ HB_EXPORT ERRCODE hb_gtScrollEx( int iTop, int iLeft, int iBottom, int iRight, i return FAILURE; } -HB_EXPORT ERRCODE hb_gtBoxEx( int iTop, int iLeft, int iBottom, int iRight, BYTE * pbyFrame, int iColor ) +ERRCODE hb_gtBoxEx( int iTop, int iLeft, int iBottom, int iRight, BYTE * pbyFrame, int iColor ) { PHB_GT pGT; @@ -1281,7 +1281,7 @@ HB_EXPORT ERRCODE hb_gtBoxEx( int iTop, int iLeft, int iBottom, int iRight, BYTE return FAILURE; } -HB_EXPORT int hb_gtGfxPrimitive( int iType, int iTop, int iLeft, int iBottom, int iRight, int iColor ) +int hb_gtGfxPrimitive( int iType, int iTop, int iLeft, int iBottom, int iRight, int iColor ) { PHB_GT pGT; int iResult = 0; @@ -1298,7 +1298,7 @@ HB_EXPORT int hb_gtGfxPrimitive( int iType, int iTop, int iLeft, int iBottom, in return iResult; } -HB_EXPORT ERRCODE hb_gtGfxText( int iTop, int iLeft, const char * cBuf, int iColor, int iSize, int iWidth ) +ERRCODE hb_gtGfxText( int iTop, int iLeft, const char * cBuf, int iColor, int iSize, int iWidth ) { PHB_GT pGT; diff --git a/harbour/source/rtl/gtapiu.c b/harbour/source/rtl/gtapiu.c index 2e5bd778c4..4e02fa2dbf 100644 --- a/harbour/source/rtl/gtapiu.c +++ b/harbour/source/rtl/gtapiu.c @@ -52,7 +52,7 @@ #include "hbapigt.h" -HB_EXPORT void hb_gtWCreate( HB_GT_RECT * rect, HB_GT_WND ** wnd ) +void hb_gtWCreate( HB_GT_RECT * rect, HB_GT_WND ** wnd ) { /* TODO: */ @@ -60,35 +60,35 @@ HB_EXPORT void hb_gtWCreate( HB_GT_RECT * rect, HB_GT_WND ** wnd ) HB_SYMBOL_UNUSED( wnd ); } -HB_EXPORT void hb_gtWDestroy( HB_GT_WND * wnd ) +void hb_gtWDestroy( HB_GT_WND * wnd ) { /* TODO: */ HB_SYMBOL_UNUSED( wnd ); } -HB_EXPORT BOOL hb_gtWFlash( void ) +BOOL hb_gtWFlash( void ) { /* TODO: */ return FALSE; } -HB_EXPORT void hb_gtWApp( HB_GT_WND ** wnd ) +void hb_gtWApp( HB_GT_WND ** wnd ) { /* TODO: */ HB_SYMBOL_UNUSED( wnd ); } -HB_EXPORT void hb_gtWCurrent( HB_GT_WND * wnd ) +void hb_gtWCurrent( HB_GT_WND * wnd ) { /* TODO: */ HB_SYMBOL_UNUSED( wnd ); } -HB_EXPORT void hb_gtWPos( HB_GT_WND * wnd, HB_GT_RECT * rect ) +void hb_gtWPos( HB_GT_WND * wnd, HB_GT_RECT * rect ) { /* TODO: */ @@ -96,7 +96,7 @@ HB_EXPORT void hb_gtWPos( HB_GT_WND * wnd, HB_GT_RECT * rect ) HB_SYMBOL_UNUSED( rect ); } -HB_EXPORT BOOL hb_gtWVis( HB_GT_WND * wnd, USHORT uiStatus ) +BOOL hb_gtWVis( HB_GT_WND * wnd, USHORT uiStatus ) { /* TODO: */ @@ -106,7 +106,7 @@ HB_EXPORT BOOL hb_gtWVis( HB_GT_WND * wnd, USHORT uiStatus ) return FALSE; } -HB_EXPORT USHORT hb_gtSLR( HB_GT_SLR * pSLR ) /* System Level Request */ +USHORT hb_gtSLR( HB_GT_SLR * pSLR ) /* System Level Request */ { /* Do nothing in Harbour, since the low-level GT API is implemented with a different method than in CA-Cl*pper. */ @@ -116,7 +116,7 @@ HB_EXPORT USHORT hb_gtSLR( HB_GT_SLR * pSLR ) /* System Level Request */ return 1; } -HB_EXPORT USHORT hb_gtModalRead( void * dummy ) +USHORT hb_gtModalRead( void * dummy ) { /* TODO: */ @@ -125,14 +125,14 @@ HB_EXPORT USHORT hb_gtModalRead( void * dummy ) return 1; } -HB_EXPORT USHORT hb_gtFlushCursor( void ) +USHORT hb_gtFlushCursor( void ) { /* TODO: */ return 1; } -HB_EXPORT USHORT hb_gtSetColor( HB_GT_RGB * color ) +USHORT hb_gtSetColor( HB_GT_RGB * color ) { /* TODO: */ @@ -141,7 +141,7 @@ HB_EXPORT USHORT hb_gtSetColor( HB_GT_RGB * color ) return 1; } -HB_EXPORT USHORT hb_gtGetColor( HB_GT_RGB * color ) +USHORT hb_gtGetColor( HB_GT_RGB * color ) { /* TODO: */ @@ -150,7 +150,7 @@ HB_EXPORT USHORT hb_gtGetColor( HB_GT_RGB * color ) return 1; } -HB_EXPORT USHORT hb_gtSetBorder( HB_GT_RGB * color ) +USHORT hb_gtSetBorder( HB_GT_RGB * color ) { /* TODO: */ diff --git a/harbour/source/rtl/hbadler.c b/harbour/source/rtl/hbadler.c index ba3e8009ba..bbdac84fa9 100644 --- a/harbour/source/rtl/hbadler.c +++ b/harbour/source/rtl/hbadler.c @@ -59,7 +59,7 @@ #define BASE 65521 /* largest prime smaller than 65536 */ #define NMAX 5552 /* largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ -HB_EXPORT ULONG hb_adler32( ULONG adler, const BYTE *buf, ULONG len ) +ULONG hb_adler32( ULONG adler, const BYTE *buf, ULONG len ) { ULONG s1 = adler & 0xffff; ULONG s2 = ( adler >> 16 ) & 0xffff; diff --git a/harbour/source/rtl/hbcrc.c b/harbour/source/rtl/hbcrc.c index 1a27567184..02ceb7138f 100644 --- a/harbour/source/rtl/hbcrc.c +++ b/harbour/source/rtl/hbcrc.c @@ -149,7 +149,7 @@ static const ULONG crc16_tab[] = }; -HB_EXPORT ULONG hb_crc32( ULONG crc, const BYTE *buf, ULONG len ) +ULONG hb_crc32( ULONG crc, const BYTE *buf, ULONG len ) { crc ^= 0xffffffffL; if( buf && len ) @@ -161,7 +161,7 @@ HB_EXPORT ULONG hb_crc32( ULONG crc, const BYTE *buf, ULONG len ) return crc ^ 0xffffffffL; } -HB_EXPORT ULONG hb_crc16( ULONG crc, const BYTE *buf, ULONG len ) +ULONG hb_crc16( ULONG crc, const BYTE *buf, ULONG len ) { crc ^= 0xffff; if( buf && len ) @@ -173,7 +173,7 @@ HB_EXPORT ULONG hb_crc16( ULONG crc, const BYTE *buf, ULONG len ) return crc ^ 0xffff; } -HB_EXPORT HB_ULONG hb_crc( HB_ULONG crc, const BYTE * buf, ULONG len, HB_ULONG poly ) +HB_ULONG hb_crc( HB_ULONG crc, const BYTE * buf, ULONG len, HB_ULONG poly ) { if( buf && len ) { @@ -203,7 +203,7 @@ HB_EXPORT HB_ULONG hb_crc( HB_ULONG crc, const BYTE * buf, ULONG len, HB_ULONG p return crc; } -HB_EXPORT HB_ULONG hb_crcct( HB_ULONG crc, const BYTE * buf, ULONG len, HB_ULONG poly ) +HB_ULONG hb_crcct( HB_ULONG crc, const BYTE * buf, ULONG len, HB_ULONG poly ) { if( buf && len ) { diff --git a/harbour/source/rtl/hbffind.c b/harbour/source/rtl/hbffind.c index 3db3482cbd..3c061724b7 100644 --- a/harbour/source/rtl/hbffind.c +++ b/harbour/source/rtl/hbffind.c @@ -789,7 +789,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind ) return bFound; } -HB_EXPORT PHB_FFIND hb_fsFindFirst( const char * pszFileMask, ULONG attrmask ) +PHB_FFIND hb_fsFindFirst( const char * pszFileMask, ULONG attrmask ) { PHB_FFIND ffind; @@ -820,7 +820,7 @@ HB_EXPORT PHB_FFIND hb_fsFindFirst( const char * pszFileMask, ULONG attrmask ) /* Finds next matching file, and applies a filter which makes searching CA-Cl*pper/MS-DOS compatible. */ -HB_EXPORT BOOL hb_fsFindNext( PHB_FFIND ffind ) +BOOL hb_fsFindNext( PHB_FFIND ffind ) { while( hb_fsFindNextLow( ffind ) ) { @@ -838,7 +838,7 @@ HB_EXPORT BOOL hb_fsFindNext( PHB_FFIND ffind ) return FALSE; } -HB_EXPORT void hb_fsFindClose( PHB_FFIND ffind ) +void hb_fsFindClose( PHB_FFIND ffind ) { if( ffind ) { diff --git a/harbour/source/rtl/hbgtcore.c b/harbour/source/rtl/hbgtcore.c index 4a54169109..3e33f72fe2 100644 --- a/harbour/source/rtl/hbgtcore.c +++ b/harbour/source/rtl/hbgtcore.c @@ -3061,19 +3061,19 @@ static const HB_GT_FUNCS s_gtCoreFunc = static char s_gtNameBuf[ HB_GT_NAME_MAX_ + 1 ]; #if defined(HB_GT_LIB) - HB_EXPORT const char * hb_gt_szNameDefault = HB_GT_DRVNAME( HB_GT_LIB ); + const char * hb_gt_szNameDefault = HB_GT_DRVNAME( HB_GT_LIB ); #elif defined(HB_WINCE) - HB_EXPORT const char * hb_gt_szNameDefault = "wvt"; + const char * hb_gt_szNameDefault = "wvt"; #elif defined(HB_OS_WIN_32) - HB_EXPORT const char * hb_gt_szNameDefault = "win"; + const char * hb_gt_szNameDefault = "win"; #elif defined(HB_OS_DOS) - HB_EXPORT const char * hb_gt_szNameDefault = "dos"; + const char * hb_gt_szNameDefault = "dos"; #elif defined(HB_OS_OS2) - HB_EXPORT const char * hb_gt_szNameDefault = "os2"; + const char * hb_gt_szNameDefault = "os2"; #elif defined(HB_OS_UNIX) - HB_EXPORT const char * hb_gt_szNameDefault = "trm"; + const char * hb_gt_szNameDefault = "trm"; #else - HB_EXPORT const char * hb_gt_szNameDefault = "std"; + const char * hb_gt_szNameDefault = "std"; #endif static const HB_GT_INIT * s_gtInit[ HB_GT_MAX_ ]; @@ -3115,13 +3115,13 @@ static int hb_gt_FindEntry( const char * pszID ) return -1; } -HB_EXPORT void hb_gtSetDefault( const char * szGtName ) +void hb_gtSetDefault( const char * szGtName ) { hb_strncpy( s_gtNameBuf, szGtName, sizeof( s_gtNameBuf ) - 1 ); hb_gt_szNameDefault = s_gtNameBuf; } -HB_EXPORT BOOL hb_gtRegister( const HB_GT_INIT * gtInit ) +BOOL hb_gtRegister( const HB_GT_INIT * gtInit ) { if( s_iGtCount < HB_GT_MAX_ && hb_gt_FindEntry( gtInit->id ) == -1 ) { @@ -3133,7 +3133,7 @@ HB_EXPORT BOOL hb_gtRegister( const HB_GT_INIT * gtInit ) return FALSE; } -HB_EXPORT PHB_GT hb_gtLoad( const char * szGtName, PHB_GT pGT, PHB_GT_FUNCS pSuperTable ) +PHB_GT hb_gtLoad( const char * szGtName, PHB_GT pGT, PHB_GT_FUNCS pSuperTable ) { int iPos; @@ -3184,7 +3184,7 @@ HB_EXPORT PHB_GT hb_gtLoad( const char * szGtName, PHB_GT pGT, PHB_GT_FUNCS pSup return NULL; } -HB_EXPORT void * hb_gtAlloc( void * hGT ) +void * hb_gtAlloc( void * hGT ) { PHB_GT pGT; @@ -3206,7 +3206,7 @@ HB_EXPORT void * hb_gtAlloc( void * hGT ) return ( void * ) pGT; } -HB_EXPORT void hb_gtRelease( void * hGT ) +void hb_gtRelease( void * hGT ) { PHB_GT pGT; @@ -3233,7 +3233,7 @@ HB_EXPORT void hb_gtRelease( void * hGT ) } } -HB_EXPORT void hb_gtAttach( void * hGT ) +void hb_gtAttach( void * hGT ) { if( hGT && hGT != hb_stackGetGT() ) { @@ -3242,7 +3242,7 @@ HB_EXPORT void hb_gtAttach( void * hGT ) } } -HB_EXPORT void * hb_gtSwap( void * hGT ) +void * hb_gtSwap( void * hGT ) { void * hCurrGT = hb_stackGetGT(); @@ -3251,7 +3251,7 @@ HB_EXPORT void * hb_gtSwap( void * hGT ) return hCurrGT; } -HB_EXPORT BOOL hb_gtReload( const char * szGtName, +BOOL hb_gtReload( const char * szGtName, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFilenoStdout, HB_FHANDLE hFilenoStderr ) @@ -3267,7 +3267,7 @@ HB_EXPORT BOOL hb_gtReload( const char * szGtName, return fResult; } -HB_EXPORT void * hb_gtCreate( const char * szGtName, +void * hb_gtCreate( const char * szGtName, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFilenoStdout, HB_FHANDLE hFilenoStderr ) @@ -3300,7 +3300,7 @@ static BOOL hb_gtTryInit( const char * szGtName, BOOL fFree ) return hb_stackGetGT() != NULL; } -HB_EXPORT void hb_gtStartupInit( void ) +void hb_gtStartupInit( void ) { if( hb_gtTryInit( hb_cmdargString( "GT" ), TRUE ) ) return; diff --git a/harbour/source/rtl/hbmd5.c b/harbour/source/rtl/hbmd5.c index fb3e6fd826..078bea0478 100644 --- a/harbour/source/rtl/hbmd5.c +++ b/harbour/source/rtl/hbmd5.c @@ -274,7 +274,7 @@ static void hb_md5digest( BYTE * md5val, char * digest ) } } -HB_EXPORT void hb_md5( BYTE * ucData, ULONG ulLen, BYTE * ucDigest ) +void hb_md5( BYTE * ucData, ULONG ulLen, BYTE * ucDigest ) { UCHAR buf[ 128 ]; MD5_BUF md5; @@ -316,7 +316,7 @@ HB_EXPORT void hb_md5( BYTE * ucData, ULONG ulLen, BYTE * ucDigest ) hb_md5val( md5.accum, ucDigest ); } -HB_EXPORT void hb_md5file( HB_FHANDLE hFile, BYTE * ucDigest ) +void hb_md5file( HB_FHANDLE hFile, BYTE * ucDigest ) { MD5_BUF md5; ULONG n; diff --git a/harbour/source/rtl/inkeyapi.c b/harbour/source/rtl/inkeyapi.c index a64bbfd9b2..cb3df361cc 100644 --- a/harbour/source/rtl/inkeyapi.c +++ b/harbour/source/rtl/inkeyapi.c @@ -52,7 +52,7 @@ #include "hbgtcore.h" -HB_EXPORT int hb_inkey( BOOL fWait, double dSeconds, int iEventMask ) +int hb_inkey( BOOL fWait, double dSeconds, int iEventMask ) { int iKey = 0; PHB_GT pGT; @@ -68,7 +68,7 @@ HB_EXPORT int hb_inkey( BOOL fWait, double dSeconds, int iEventMask ) return iKey; } -HB_EXPORT void hb_inkeyPut( int iKey ) +void hb_inkeyPut( int iKey ) { PHB_GT pGT; @@ -82,7 +82,7 @@ HB_EXPORT void hb_inkeyPut( int iKey ) } } -HB_EXPORT void hb_inkeyIns( int iKey ) +void hb_inkeyIns( int iKey ) { PHB_GT pGT; @@ -96,7 +96,7 @@ HB_EXPORT void hb_inkeyIns( int iKey ) } } -HB_EXPORT int hb_inkeyLast( int iEventMask ) +int hb_inkeyLast( int iEventMask ) { int iKey = 0; PHB_GT pGT; @@ -112,7 +112,7 @@ HB_EXPORT int hb_inkeyLast( int iEventMask ) return iKey; } -HB_EXPORT int hb_inkeyNext( int iEventMask ) +int hb_inkeyNext( int iEventMask ) { int iKey = 0; PHB_GT pGT; @@ -128,7 +128,7 @@ HB_EXPORT int hb_inkeyNext( int iEventMask ) return iKey; } -HB_EXPORT void hb_inkeyPoll( void ) +void hb_inkeyPoll( void ) { PHB_GT pGT; @@ -142,7 +142,7 @@ HB_EXPORT void hb_inkeyPoll( void ) } } -HB_EXPORT int hb_inkeySetLast( int iKey ) +int hb_inkeySetLast( int iKey ) { int iLast = 0; PHB_GT pGT; @@ -158,7 +158,7 @@ HB_EXPORT int hb_inkeySetLast( int iKey ) return iLast; } -HB_EXPORT void hb_inkeySetText( const char * szText, ULONG ulLen ) +void hb_inkeySetText( const char * szText, ULONG ulLen ) { PHB_GT pGT; @@ -172,7 +172,7 @@ HB_EXPORT void hb_inkeySetText( const char * szText, ULONG ulLen ) } } -HB_EXPORT void hb_inkeyReset( void ) +void hb_inkeyReset( void ) { PHB_GT pGT; @@ -186,7 +186,7 @@ HB_EXPORT void hb_inkeyReset( void ) } } -HB_EXPORT void hb_inkeySetCancelKeys( int iCancelKey, int iCancelKeyEx ) +void hb_inkeySetCancelKeys( int iCancelKey, int iCancelKeyEx ) { HB_TRACE(HB_TR_DEBUG, ("hb_inkeySetCancelKeys(%d,%d)", iCancelKey, iCancelKeyEx)); diff --git a/harbour/source/rtl/isprint.c b/harbour/source/rtl/isprint.c index 87d562aeb9..34e7a96fcc 100644 --- a/harbour/source/rtl/isprint.c +++ b/harbour/source/rtl/isprint.c @@ -53,7 +53,7 @@ #include "hbapi.h" #include "hbapifs.h" -HB_EXPORT BOOL hb_printerIsReady( char * pszPrinterName ) +BOOL hb_printerIsReady( char * pszPrinterName ) { BOOL bIsPrinter; diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c index 85d43d721e..dbc300e741 100644 --- a/harbour/source/rtl/math.c +++ b/harbour/source/rtl/math.c @@ -156,7 +156,7 @@ void hb_mathResetError( HB_MATH_EXCEPTION * phb_exc ) /* route C math lib errors to Harbour error handling */ #if defined(HB_MATH_HANDLER) -HB_EXPORT int matherr( struct exception *err ) +int matherr( struct exception *err ) { int retval; HB_MATH_HANDLERPROC mathHandler; diff --git a/harbour/source/rtl/mouseapi.c b/harbour/source/rtl/mouseapi.c index 1795e9c0d3..7947b30b4e 100644 --- a/harbour/source/rtl/mouseapi.c +++ b/harbour/source/rtl/mouseapi.c @@ -70,7 +70,7 @@ */ /* C callable interface */ -HB_EXPORT BOOL hb_mouseIsPresent( void ) +BOOL hb_mouseIsPresent( void ) { BOOL fPresent = FALSE; PHB_GT pGT; @@ -86,7 +86,7 @@ HB_EXPORT BOOL hb_mouseIsPresent( void ) return fPresent; } -HB_EXPORT BOOL hb_mouseGetCursor( void ) +BOOL hb_mouseGetCursor( void ) { BOOL fVisible = FALSE; PHB_GT pGT; @@ -102,7 +102,7 @@ HB_EXPORT BOOL hb_mouseGetCursor( void ) return fVisible; } -HB_EXPORT void hb_mouseSetCursor( BOOL fVisible ) +void hb_mouseSetCursor( BOOL fVisible ) { PHB_GT pGT; @@ -116,7 +116,7 @@ HB_EXPORT void hb_mouseSetCursor( BOOL fVisible ) } } -HB_EXPORT int hb_mouseCol( void ) +int hb_mouseCol( void ) { int iCol = 0; PHB_GT pGT; @@ -132,7 +132,7 @@ HB_EXPORT int hb_mouseCol( void ) return iCol; } -HB_EXPORT int hb_mouseRow( void ) +int hb_mouseRow( void ) { int iRow = 0; PHB_GT pGT; @@ -148,7 +148,7 @@ HB_EXPORT int hb_mouseRow( void ) return iRow; } -HB_EXPORT void hb_mouseGetPos( int * piRow, int * piCol ) +void hb_mouseGetPos( int * piRow, int * piCol ) { PHB_GT pGT; @@ -162,7 +162,7 @@ HB_EXPORT void hb_mouseGetPos( int * piRow, int * piCol ) } } -HB_EXPORT void hb_mouseSetPos( int iRow, int iCol ) +void hb_mouseSetPos( int iRow, int iCol ) { PHB_GT pGT; @@ -176,7 +176,7 @@ HB_EXPORT void hb_mouseSetPos( int iRow, int iCol ) } } -HB_EXPORT void hb_mouseSetBounds( int iTop, int iLeft, int iBottom, int iRight ) +void hb_mouseSetBounds( int iTop, int iLeft, int iBottom, int iRight ) { PHB_GT pGT; @@ -190,7 +190,7 @@ HB_EXPORT void hb_mouseSetBounds( int iTop, int iLeft, int iBottom, int iRight ) } } -HB_EXPORT void hb_mouseGetBounds( int * piTop, int * piLeft, int * piBottom, int * piRight ) +void hb_mouseGetBounds( int * piTop, int * piLeft, int * piBottom, int * piRight ) { PHB_GT pGT; @@ -204,7 +204,7 @@ HB_EXPORT void hb_mouseGetBounds( int * piTop, int * piLeft, int * piBottom, int } } -HB_EXPORT int hb_mouseStorageSize( void ) +int hb_mouseStorageSize( void ) { int iSize = 0; PHB_GT pGT; @@ -220,7 +220,7 @@ HB_EXPORT int hb_mouseStorageSize( void ) return iSize; } -HB_EXPORT void hb_mouseSaveState( BYTE * pBuffer ) +void hb_mouseSaveState( BYTE * pBuffer ) { PHB_GT pGT; @@ -234,7 +234,7 @@ HB_EXPORT void hb_mouseSaveState( BYTE * pBuffer ) } } -HB_EXPORT void hb_mouseRestoreState( BYTE * pBuffer ) +void hb_mouseRestoreState( BYTE * pBuffer ) { PHB_GT pGT; @@ -248,7 +248,7 @@ HB_EXPORT void hb_mouseRestoreState( BYTE * pBuffer ) } } -HB_EXPORT int hb_mouseGetDoubleClickSpeed( void ) +int hb_mouseGetDoubleClickSpeed( void ) { int iSpeed = 0; PHB_GT pGT; @@ -264,7 +264,7 @@ HB_EXPORT int hb_mouseGetDoubleClickSpeed( void ) return iSpeed; } -HB_EXPORT void hb_mouseSetDoubleClickSpeed( int iSpeed ) +void hb_mouseSetDoubleClickSpeed( int iSpeed ) { PHB_GT pGT; @@ -278,7 +278,7 @@ HB_EXPORT void hb_mouseSetDoubleClickSpeed( int iSpeed ) } } -HB_EXPORT int hb_mouseCountButton( void ) +int hb_mouseCountButton( void ) { int iButtons = 0; PHB_GT pGT; @@ -294,7 +294,7 @@ HB_EXPORT int hb_mouseCountButton( void ) return iButtons; } -HB_EXPORT BOOL hb_mouseButtonState( int iButton ) +BOOL hb_mouseButtonState( int iButton ) { BOOL fPressed = FALSE; PHB_GT pGT; @@ -310,7 +310,7 @@ HB_EXPORT BOOL hb_mouseButtonState( int iButton ) return fPressed; } -HB_EXPORT BOOL hb_mouseButtonPressed( int iButton, int * piRow, int * piCol ) +BOOL hb_mouseButtonPressed( int iButton, int * piRow, int * piCol ) { BOOL fPressed = FALSE; PHB_GT pGT; @@ -326,7 +326,7 @@ HB_EXPORT BOOL hb_mouseButtonPressed( int iButton, int * piRow, int * piCol ) return fPressed; } -HB_EXPORT BOOL hb_mouseButtonReleased( int iButton, int * piRow, int * piCol ) +BOOL hb_mouseButtonReleased( int iButton, int * piRow, int * piCol ) { BOOL fReleased = FALSE; PHB_GT pGT; @@ -342,7 +342,7 @@ HB_EXPORT BOOL hb_mouseButtonReleased( int iButton, int * piRow, int * piCol ) return fReleased; } -HB_EXPORT int hb_mouseReadKey( int iEventMask ) +int hb_mouseReadKey( int iEventMask ) { int iKey = 0; PHB_GT pGT; diff --git a/harbour/source/rtl/seconds.c b/harbour/source/rtl/seconds.c index e0126afca2..e82a63c700 100644 --- a/harbour/source/rtl/seconds.c +++ b/harbour/source/rtl/seconds.c @@ -83,7 +83,7 @@ #endif #endif -HB_EXPORT void hb_dateTimeStamp( LONG * plJulian, LONG * plMilliSec ) +void hb_dateTimeStamp( LONG * plJulian, LONG * plMilliSec ) { #if defined(HB_OS_WIN_32) SYSTEMTIME st; @@ -138,7 +138,7 @@ HB_EXPORT void hb_dateTimeStamp( LONG * plJulian, LONG * plMilliSec ) #endif } -HB_EXPORT HB_ULONG hb_dateMilliSeconds( void ) +HB_ULONG hb_dateMilliSeconds( void ) { #if defined(HB_OS_WIN_32) SYSTEMTIME st; @@ -169,7 +169,7 @@ HB_EXPORT HB_ULONG hb_dateMilliSeconds( void ) #endif } -HB_EXPORT double hb_dateSeconds( void ) +double hb_dateSeconds( void ) { #if defined(HB_OS_WIN_32) SYSTEMTIME SystemTime; @@ -253,7 +253,7 @@ HB_FUNC( HB_CLOCKS2SECS ) n == 12 cstime -> sum of the system CPU time of the current + child process n == 13 cu+cs -> sum of cutime + cstime */ -HB_EXPORT double hb_secondsCPU( int n ) +double hb_secondsCPU( int n ) { double d = 0.0; #if defined( HB_OS_WIN_32 ) && !defined( HB_OS_UNIX_COMPATIBLE ) diff --git a/harbour/source/rtl/setcolor.c b/harbour/source/rtl/setcolor.c index 3493e217de..149e52cc06 100644 --- a/harbour/source/rtl/setcolor.c +++ b/harbour/source/rtl/setcolor.c @@ -54,7 +54,7 @@ #include "hbapigt.h" #include "hbset.h" -HB_EXPORT char * hb_conSetColor( const char * szColor ) +char * hb_conSetColor( const char * szColor ) { char * szOldColor; diff --git a/harbour/source/rtl/setcurs.c b/harbour/source/rtl/setcurs.c index fd7d49084d..0ac64ec937 100644 --- a/harbour/source/rtl/setcurs.c +++ b/harbour/source/rtl/setcurs.c @@ -53,7 +53,7 @@ #include "hbapi.h" #include "hbapigt.h" -HB_EXPORT USHORT hb_conSetCursor( BOOL bSetCursor, USHORT uiNewCursor ) +USHORT hb_conSetCursor( BOOL bSetCursor, USHORT uiNewCursor ) { USHORT uiCursor; diff --git a/harbour/source/rtl/strmatch.c b/harbour/source/rtl/strmatch.c index e75bbba8f8..86d9175507 100644 --- a/harbour/source/rtl/strmatch.c +++ b/harbour/source/rtl/strmatch.c @@ -59,7 +59,7 @@ #define HB_MAX_WILDPATTERN 256 -HB_EXPORT BOOL hb_strMatchWild( const char *szString, const char *szPattern ) +BOOL hb_strMatchWild( const char *szString, const char *szPattern ) { BOOL fMatch = TRUE, fAny = FALSE; ULONG pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ], @@ -129,7 +129,7 @@ HB_EXPORT BOOL hb_strMatchWild( const char *szString, const char *szPattern ) return fMatch; } -HB_EXPORT BOOL hb_strMatchWildExact( const char *szString, const char *szPattern ) +BOOL hb_strMatchWildExact( const char *szString, const char *szPattern ) { BOOL fMatch = TRUE, fAny = FALSE; ULONG pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ], @@ -200,7 +200,7 @@ HB_EXPORT BOOL hb_strMatchWildExact( const char *szString, const char *szPattern return fMatch; } -HB_EXPORT BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern ) +BOOL hb_strMatchCaseWildExact( const char *szString, const char *szPattern ) { BOOL fMatch = TRUE, fAny = FALSE; ULONG pulBufPosP[ HB_MAX_WILDPATTERN ], pulBufPosV[ HB_MAX_WILDPATTERN ], @@ -290,7 +290,7 @@ BOOL hb_strMatchRegExp( const char * szString, const char * szPattern ) return hb_strMatchWildExact( szString, szPattern ); } -HB_EXPORT BOOL hb_strMatchFile( const char * szString, const char * szPattern ) +BOOL hb_strMatchFile( const char * szString, const char * szPattern ) { #if defined( HB_OS_UNIX ) # if defined( __WATCOMC__ ) diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 94f9893b21..dec9d6bbd8 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -10882,7 +10882,7 @@ HB_LANG_REQUEST( HB_LANG_DEFAULT ) #ifdef HB_FORCE_LINK_MAIN HB_EXTERN_BEGIN -extern HB_EXPORT void HB_FORCE_LINK_MAIN( void ); +extern void HB_FORCE_LINK_MAIN( void ); HB_EXTERN_END void _hb_forceLinkMain() {