fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-04-01 21:10 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* src/common/hbverdsp.c
    * do not show '(WINANSI)' in the list of version flags.

  * utils/hbmk2/hbmk2.prg
    + add -inc to xbuild and xmate converted projects, this being 
      the default mode of operation (AFAI guess) of these tools.

  * contrib/hbct/disk.c
  * contrib/hbnf/kspeed.c
  * contrib/hbnf/peek.c
  * contrib/hbnf/proper.c
  * contrib/hbnf/ftidle.c
  * contrib/hbnf/mouse.c
  * contrib/hbnf/stod.c
  * contrib/hbnf/getvid.c
  * contrib/hbnf/getver.c
  * contrib/hbnf/getenvrn.c
  * contrib/hbnf/mkdir.c
  * contrib/hbnf/rmdir.c
    ! formatting
This commit is contained in:
Viktor Szakats
2012-04-01 19:11:20 +00:00
parent 358230f35c
commit cc84cb85b6
15 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
harbour/ChangeLog
View File

@@ -16,6 +16,28 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-04-01 21:10 UTC+0200 Viktor Szakats (harbour syenar.net)
* src/common/hbverdsp.c
* do not show '(WINANSI)' in the list of version flags.
* utils/hbmk2/hbmk2.prg
+ add -inc to xbuild and xmate converted projects, this being
the default mode of operation (AFAI guess) of these tools.
* contrib/hbct/disk.c
* contrib/hbnf/kspeed.c
* contrib/hbnf/peek.c
* contrib/hbnf/proper.c
* contrib/hbnf/ftidle.c
* contrib/hbnf/mouse.c
* contrib/hbnf/stod.c
* contrib/hbnf/getvid.c
* contrib/hbnf/getver.c
* contrib/hbnf/getenvrn.c
* contrib/hbnf/mkdir.c
* contrib/hbnf/rmdir.c
! formatting
2012-04-01 17:07 UTC+0200 Viktor Szakats (harbour syenar.net)
* config/win/mingw.mk
* removed undocumented way (committed in prev rev) to disable

4
harbour/contrib/hbct/disk.c
View File

@@ -71,10 +71,10 @@
#include "hbwinuni.h"
#if defined( HB_OS_DOS )
# include <dos.h>
# include <dos.h>
#endif
#if defined( HB_OS_WIN )
#include <windows.h>
# include <windows.h>
#endif
HB_FUNC( DIRMAKE )

2
harbour/contrib/hbnf/ftidle.c
View File

@@ -21,7 +21,7 @@
#include "hbdefs.h"
#include "hbapi.h"
HB_FUNC(FT_Idle)
HB_FUNC( FT_IDLE )
{
hb_idleState();
}

16
harbour/contrib/hbnf/getenvrn.c
View File

@@ -30,18 +30,18 @@
#include "hbapi.h"
#if defined( HB_OS_UNIX )
# include <unistd.h>
# if defined( HB_OS_DARWIN )
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
# elif !defined( __WATCOMC__ )
# include <unistd.h>
# if defined( HB_OS_DARWIN )
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
# elif !defined( __WATCOMC__ )
extern char **environ;
# endif
# endif
#elif defined( HB_OS_DOS )
# define environ _environ
# define environ _environ
extern char **_environ;
#elif defined( HB_OS_WIN )
# include <windows.h>
# include <windows.h>
#endif
#define NORETURN 0

2
harbour/contrib/hbnf/getver.c
View File

@@ -54,7 +54,7 @@
#include "hbapi.h"
#include "hbapiitm.h"
#if defined( HB_OS_DOS )
#include "dos.h"
# include "dos.h"
#endif
#include "string.h"
#include "stdlib.h"

2
harbour/contrib/hbnf/getvid.c
View File

@@ -53,7 +53,7 @@
#include "hbapi.h"
#if defined( HB_OS_DOS )
#include "dos.h"
# include "dos.h"
#endif
HB_FUNC( _FT_GETVPG )

2
harbour/contrib/hbnf/kspeed.c
View File

@@ -81,7 +81,7 @@ _NanFor ENDS
#include "hbapi.h"
#if defined( HB_OS_DOS )
#include "dos.h"
# include "dos.h"
#endif
HB_FUNC( FT_SETRATE )

4
harbour/contrib/hbnf/mkdir.c
View File

@@ -52,7 +52,7 @@ End
#include "hbapi.h"
#include "hbapifs.h"
HB_FUNC(FT_MKDIR)
HB_FUNC( FT_MKDIR )
{
hb_retl( HB_ISCHAR( 1 ) && hb_fsMkDir( hb_parc(1) ) );
hb_retl( HB_ISCHAR( 1 ) && hb_fsMkDir( hb_parc( 1 ) ) );
}

2
harbour/contrib/hbnf/mouse.c
View File

@@ -53,7 +53,7 @@
#include "hbapi.h"
#if defined( HB_OS_DOS )
#include "dos.h"
# include "dos.h"
#endif
#include "hbapiitm.h"
#include "hbapigt.h"

2
harbour/contrib/hbnf/peek.c
View File

@@ -35,7 +35,7 @@
#define FP_SEG( fp ) ( *( ( unsigned int * ) &( fp ) + 1 ) )
#define FP_OFF( fp ) ( *( ( unsigned int * ) &( fp ) ) )
HB_FUNC(FT_PEEK)
HB_FUNC( FT_PEEK )
{
auto unsigned int ProtMode = cpmiIsProtected();
auto unsigned char * bytePtr;

84
harbour/contrib/hbnf/proper.c
View File

@@ -36,69 +36,69 @@
static char _ftToLower( char c )
{
return c >= 'A' && c <= 'Z' ? c - 'A' + 'a' : c;
return c >= 'A' && c <= 'Z' ? c - 'A' + 'a' : c;
}
static char _ftToUpper( char c )
{
return c >= 'a' && c <= 'z' ? c - 'a' + 'A' : c;
return c >= 'a' && c <= 'z' ? c - 'a' + 'A' : c;
}
static HB_BOOL _ftIsUpper( char c )
{
return c >= 'A' && c <= 'Z';
return c >= 'A' && c <= 'Z';
}
static HB_BOOL _ftIsLower( char c )
{
return c >= 'a' && c <= 'z';
return c >= 'a' && c <= 'z';
}
static HB_BOOL _ftIsAlpha( char c )
{
return _ftIsUpper(c) || _ftIsLower(c);
return _ftIsUpper( c ) || _ftIsLower( c );
}
HB_FUNC( FT_PROPER )
{
HB_ISIZ iLen = hb_parclen(1);
const char *cStr;
char *cDst = NULL;
HB_ISIZ i; /*, iPos = 0; */
HB_BOOL fCap = HB_TRUE;
HB_ISIZ iLen = hb_parclen(1);
const char *cStr;
char *cDst = NULL;
HB_ISIZ i; /*, iPos = 0; */
HB_BOOL fCap = HB_TRUE;
hb_storc( NULL, 1 );
cStr = hb_parc(1);
hb_storc( NULL, 1 );
cStr = hb_parc(1);
for( i = 0; i < iLen; i++ ) {
if( _ftIsAlpha( cStr[i] ) ) {
if( !cDst ) {
cDst = (char *) hb_xgrab(iLen + 1);
memcpy(cDst, cStr, iLen + 1);
}
if( fCap )
cDst[i] = _ftToUpper( cDst[i] );
else
cDst[i] = _ftToLower( cDst[i] );
}
fCap = ( cStr[i] == ' ' || cStr[i] == '-' || cStr[i] == 0x27 );
}
for( i = 0; i < iLen; i++ ) {
if( _ftIsAlpha( cStr[i] ) ) {
if( !cDst ) {
cDst = (char *) hb_xgrab(iLen + 1);
memcpy(cDst, cStr, iLen + 1);
}
if( fCap )
cDst[i] = _ftToUpper( cDst[i] );
else
cDst[i] = _ftToLower( cDst[i] );
}
fCap = ( cStr[i] == ' ' || cStr[i] == '-' || cStr[i] == 0x27 );
}
/* Find "Mc" */
if( cDst ) {
for( i = 0; i < iLen - 2; i++ )
if( cStr[i] == 'M' && cStr[i+1] == 'c' ) {
cDst[i+2] = _ftToUpper( cDst[i+2] );
}
}
/* // If "Mc" was found, Cap next letter if Alpha
if( iPos > 1 )
if( iPos < iLen )
if( ! _ftIsUpper( cStr[iPos] ) )
cStr[iPos] = _ftToUpper( cStr[iPos] );
*/
if( cDst )
hb_retclen_buffer( cDst, iLen );
else
hb_retclen( cStr, iLen );
/* Find "Mc" */
if( cDst ) {
for( i = 0; i < iLen - 2; i++ )
if( cStr[i] == 'M' && cStr[i+1] == 'c' ) {
cDst[i+2] = _ftToUpper( cDst[i+2] );
}
}
/* // If "Mc" was found, Cap next letter if Alpha
if( iPos > 1 )
if( iPos < iLen )
if( ! _ftIsUpper( cStr[iPos] ) )
cStr[iPos] = _ftToUpper( cStr[iPos] );
*/
if( cDst )
hb_retclen_buffer( cDst, iLen );
else
hb_retclen( cStr, iLen );
}

4
harbour/contrib/hbnf/rmdir.c
View File

@@ -51,7 +51,7 @@ End
#include "hbapi.h"
#include "hbapifs.h"
HB_FUNC(FT_RMDIR)
HB_FUNC( FT_RMDIR )
{
hb_retl( HB_ISCHAR( 1 ) && hb_fsRmDir( hb_parc(1) ) );
hb_retl( HB_ISCHAR( 1 ) && hb_fsRmDir( hb_parc( 1 ) ) );
}

2
harbour/contrib/hbnf/stod.c
View File

@@ -27,7 +27,7 @@
#include "hbapi.h"
HB_FUNC(FT_STOD)
HB_FUNC( FT_STOD )
{
hb_retds( hb_parclen( 1 ) >= 8 ? hb_parc( 1 ) : NULL );
}

3
harbour/src/common/hbverdsp.c
View File

@@ -157,9 +157,6 @@ void hb_verBuildInfo( void )
#endif
#if defined( HB_CLP_STRICT )
hb_conOutErr( "(Clipper 5.x strict) ", 0 );
#endif
#if defined( HB_OS_WIN ) && ! defined( UNICODE )
hb_conOutErr( "(WINANSI) ", 0 );
#endif
hb_conOutErr( hb_conNewLine(), 0 );

2
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -11965,6 +11965,7 @@ STATIC PROCEDURE convert_xbp_to_hbp( hbmk, cSrcName, cDstName )
AAdd( aDst, "# Automatically converted by hbmk2 from xbuild project:" )
AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
AAdd( aDst, "" )
AAdd( aDst, "-inc" )
IF ".lib" $ cSrcName
AAdd( aDst, "-hblib" )
@@ -12095,6 +12096,7 @@ STATIC PROCEDURE convert_xhp_to_hbp( hbmk, cSrcName, cDstName )
AAdd( aDst, "# Automatically converted by hbmk2 from xMate project:" )
AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
AAdd( aDst, "" )
AAdd( aDst, "-inc" )
cSrc := StrTran( cSrc, Chr( 13 ) + Chr( 10 ), Chr( 10 ) )
cSrc := StrTran( cSrc, Chr( 9 ), " " )