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

2011-01-08 13:38 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/vm/dlmalloc.c
  * harbour/contrib/xhb/win32prn.ch
  * harbour/contrib/rddbm/bmdbfx.c
  * harbour/contrib/hbxdiff/hbxdiff.ch
  * harbour/contrib/hbmisc/nconvert.prg
  * harbour/contrib/hbssl/bio.c
    * replaced TABs with SPACEs
This commit is contained in:
Przemyslaw Czerpak
2011-01-08 12:39:08 +00:00
parent 8b3766d8ef
commit efe66864a4
7 changed files with 86 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -16,6 +16,15 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-01-08 13:38 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/vm/dlmalloc.c
* harbour/contrib/xhb/win32prn.ch
* harbour/contrib/rddbm/bmdbfx.c
* harbour/contrib/hbxdiff/hbxdiff.ch
* harbour/contrib/hbmisc/nconvert.prg
* harbour/contrib/hbssl/bio.c
* replaced TABs with SPACEs
2011-01-08 13:27 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/contrib/xhb/xhbmvinf.c
* harbour/contrib/3rd/sqlite3/sqlite3x.h

108
harbour/contrib/hbmisc/nconvert.prg
View File

@@ -148,57 +148,57 @@ FUNCTION HexaToDec( cString )
RETURN nNumber
FUNCTION DecToRoman( nNumber )
LOCAL cRoman := ""
DO WHILE ( nNumber >= 1000 )
cRoman += "M"
nNumber -= 1000
END
DO WHILE ( nNumber >= 900 )
cRoman += "CM"
nNumber -= 900
END
DO WHILE ( nNumber >= 500 )
cRoman += "D"
nNumber -= 500
END
DO WHILE ( nNumber >= 400 )
cRoman += "CD"
nNumber -= 400
END
DO WHILE ( nNumber >= 100 )
cRoman += "C"
nNumber -= 100
END
DO WHILE ( nNumber >= 90 )
cRoman += "XC"
nNumber -= 90
END
DO WHILE ( nNumber >= 50 )
cRoman += "L"
nNumber -= 50
END
DO WHILE ( nNumber >= 40 )
cRoman += "XL"
nNumber -= 40
END
DO WHILE ( nNumber >= 10 )
cRoman += "X"
nNumber -= 10
END
DO WHILE ( nNumber >= 9 )
cRoman += "IX"
nNumber -= 9
END
DO WHILE ( nNumber >= 5 )
cRoman += "V"
nNumber -= 5
END
DO WHILE ( nNumber >= 4 )
cRoman += "IV"
nNumber -= 4
END
DO WHILE ( nNumber >= 1 )
cRoman += "I"
--nNumber
END
RETURN cRoman
LOCAL cRoman := ""
DO WHILE ( nNumber >= 1000 )
cRoman += "M"
nNumber -= 1000
END
DO WHILE ( nNumber >= 900 )
cRoman += "CM"
nNumber -= 900
END
DO WHILE ( nNumber >= 500 )
cRoman += "D"
nNumber -= 500
END
DO WHILE ( nNumber >= 400 )
cRoman += "CD"
nNumber -= 400
END
DO WHILE ( nNumber >= 100 )
cRoman += "C"
nNumber -= 100
END
DO WHILE ( nNumber >= 90 )
cRoman += "XC"
nNumber -= 90
END
DO WHILE ( nNumber >= 50 )
cRoman += "L"
nNumber -= 50
END
DO WHILE ( nNumber >= 40 )
cRoman += "XL"
nNumber -= 40
END
DO WHILE ( nNumber >= 10 )
cRoman += "X"
nNumber -= 10
END
DO WHILE ( nNumber >= 9 )
cRoman += "IX"
nNumber -= 9
END
DO WHILE ( nNumber >= 5 )
cRoman += "V"
nNumber -= 5
END
DO WHILE ( nNumber >= 4 )
cRoman += "IV"
nNumber -= 4
END
DO WHILE ( nNumber >= 1 )
cRoman += "I"
--nNumber
END
RETURN cRoman

34
harbour/contrib/hbssl/bio.c
View File

@@ -695,8 +695,8 @@ HB_FUNC( ERR_LOAD_BIO_STRINGS )
#if 0
#define BIO_set_url(b,url) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,0,(char *)(url))
#define BIO_set_proxies(b,p) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,1,(char *)(p))
#define BIO_set_url(b,url) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,0,(char *)(url))
#define BIO_set_proxies(b,p) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,1,(char *)(p))
/* BIO_set_nbio(b,n) */
#define BIO_set_filter_bio(b,s) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,2,(char *)(s))
/* BIO *BIO_get_filter_bio(BIO *bio); */
@@ -706,23 +706,23 @@ HB_FUNC( ERR_LOAD_BIO_STRINGS )
#define BIO_get_proxy_header(b,skp) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,0,(char *)skp)
#define BIO_get_proxies(b,pxy_p) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,1,(char *)(pxy_p))
#define BIO_get_url(b,url) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char *)(url))
#define BIO_get_no_connect_return(b) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
#define BIO_get_url(b,url) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char *)(url))
#define BIO_get_no_connect_return(b) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
#define BIO_set_fp(b,fp,c) BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
#define BIO_get_fp(b,fpp) BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
#define BIO_set_fp(b,fp,c) BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
#define BIO_get_fp(b,fpp) BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
int BIO_indent(BIO *b,int indent,int max);
long BIO_ctrl(BIO *bp,int cmd,long larg,void *parg);
long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const char *, int, long, long));
char * BIO_ptr_ctrl(BIO *bp,int cmd,long larg);
long BIO_int_ctrl(BIO *bp,int cmd,long larg,int iarg);
BIO * BIO_push(BIO *b,BIO *append);
BIO * BIO_pop(BIO *b);
BIO * BIO_find_type(BIO *b,int bio_type);
BIO * BIO_next(BIO *b);
BIO * BIO_get_retry_BIO(BIO *bio, int *reason);
BIO * BIO_dup_chain(BIO *in);
int BIO_indent(BIO *b,int indent,int max);
long BIO_ctrl(BIO *bp,int cmd,long larg,void *parg);
long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const char *, int, long, long));
char * BIO_ptr_ctrl(BIO *bp,int cmd,long larg);
long BIO_int_ctrl(BIO *bp,int cmd,long larg,int iarg);
BIO * BIO_push(BIO *b,BIO *append);
BIO * BIO_pop(BIO *b);
BIO * BIO_find_type(BIO *b,int bio_type);
BIO * BIO_next(BIO *b);
BIO * BIO_get_retry_BIO(BIO *bio, int *reason);
BIO * BIO_dup_chain(BIO *in);
int BIO_nread0(BIO *bio, char **buf);
int BIO_nread(BIO *bio, char **buf, int num);

2
harbour/contrib/hbxdiff/hbxdiff.ch
View File

@@ -62,7 +62,7 @@
#define XDL_PATCH_REVERSE ( asc( '+' ) )
#define XDL_PATCH_MODEMASK ( hb_bitShift( 1, 8 ) - 1 )
#define XDL_PATCH_IGNOREBSPACE ( hb_bitShift( 1, 8 ) )
#define XDL_MMB_READONLY ( hb_bitShift( 1, 0 ) )
#define XDL_MMF_ATOMIC ( hb_bitShift( 1, 0 ) )

2
harbour/contrib/rddbm/bmdbfx.c
View File

@@ -66,7 +66,7 @@
#include "rddsys.ch"
/* not this function is RDD independent and can work with any RDD suporting
/* now this function is RDD independent and can work with any RDD suporting
* DBOI_SKIPWILD and DBOI_SKIPWILDBACK
*/
HB_FUNC( BM_DBSEEKWILD )

4
harbour/contrib/xhb/win32prn.ch
View File

@@ -311,8 +311,8 @@
#define GREEN 0x0000FF00
#define MAGENTA 0x00FF00FF
#define ORANGE 0X000A80FF
#define PINK 0x00CBC0FF
#define PURPLE 0x00800080
#define PINK 0x00CBC0FF
#define PURPLE 0x00800080
#define RED 0x000000FF
#define WHITE 0x00FFFFFF
#define YELLOW 0x0000FFFF

4
harbour/src/vm/dlmalloc.c
View File

@@ -1386,7 +1386,7 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
/* Declarations for bit scanning on win32 */
#if defined(_MSC_VER) && _MSC_VER>=1300
#ifndef BitScanForward /* Try to avoid pulling in WinNT.h */
#ifndef BitScanForward /* Try to avoid pulling in WinNT.h */
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -1895,7 +1895,7 @@ static MLOCK_T malloc_global_mutex = PTHREAD_MUTEX_INITIALIZER;
#ifdef linux
#ifndef PTHREAD_MUTEX_RECURSIVE
extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr,
int __kind));
int __kind));
#define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
#define pthread_mutexattr_settype(x,y) pthread_mutexattr_setkind_np(x,y)
#endif