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

2025-02-03 12:26 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* include/hbdefs.h
  * contrib/sddsqlt3/core.c
    - removed HB_WATCOM_64BUG macro - new versions of OW 2.0 supports 64bit
      integers in preprocessor directives - Many thanks to Aleksander who
      reported the problem on OpenWatcom V2 forum
    + added test for 64bit support in C preprocessor suggested by Aleksander

  * .github/workflows/windows-ci.yml
    * minor simplification
This commit is contained in:
Przemysław Czerpak
2025-02-03 12:26:02 +01:00
parent f39adf0370
commit 91e06d0ff1
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/windows-ci.yml vendored
View File

@@ -111,7 +111,6 @@ jobs:
case ${{matrix.strictness}} in case ${{matrix.strictness}} in
normal) ;; normal) ;;
strict) case ${{matrix.compiler}} in strict) case ${{matrix.compiler}} in
(mingw64) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
(bcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -w!" ;; (bcc) HB_USER_CFLAGS="$HB_USER_CFLAGS -w!" ;;
(*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;; (*) HB_USER_CFLAGS="$HB_USER_CFLAGS -Werror" ;;
esac ;; esac ;;

11
ChangeLog.txt
View File

@@ -7,6 +7,17 @@
Entries may not always be in chronological/commit order. Entries may not always be in chronological/commit order.
See license at the end of file. */ See license at the end of file. */
2025-02-03 12:26 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbdefs.h
* contrib/sddsqlt3/core.c
- removed HB_WATCOM_64BUG macro - new versions of OW 2.0 supports 64bit
integers in preprocessor directives - Many thanks to Aleksander who
reported the problem on OpenWatcom V2 forum
+ added test for 64bit support in C preprocessor suggested by Aleksander
* .github/workflows/windows-ci.yml
* minor simplification
2025-02-03 10:50 UTC+0100 Aleksander Czajczynski (hb fki.pl) 2025-02-03 10:50 UTC+0100 Aleksander Czajczynski (hb fki.pl)
* contrib/hbcurl/core.c * contrib/hbcurl/core.c
* formatting, use HB_IT_EVALITEM instead ( HB_IT_BLOCK | HB_IT_SYMBOL ) * formatting, use HB_IT_EVALITEM instead ( HB_IT_BLOCK | HB_IT_SYMBOL )

2
contrib/sddsqlt3/core.c
View File

@@ -590,7 +590,7 @@ static HB_ERRCODE sqlite3GoTo( SQLBASEAREAP pArea, HB_ULONG ulRecNo )
break; break;
case HB_FT_INTEGER: case HB_FT_INTEGER:
#if HB_VMLONG_MAX != INT32_MAX && ! defined( HB_LONG_LONG_OFF ) #if HB_VMLONG_MAX > INT32_MAX && ! defined( HB_LONG_LONG_OFF )
pItem = hb_itemPutNInt( NULL, sqlite3_column_int64( st, ui ) ); pItem = hb_itemPutNInt( NULL, sqlite3_column_int64( st, ui ) );
break; break;
#else #else

12
include/hbdefs.h
View File

@@ -511,8 +511,12 @@ typedef HB_U32 HB_SYMCNT;
# define HB_ULL( num ) num##ULL # define HB_ULL( num ) num##ULL
#endif #endif
#if defined( __WATCOMC__ ) && LONGLONG_MAX < LONG_MAX #if LONGLONG_MAX < LONG_MAX
#define HB_WATCOM_64BUG #if defined( __WATCOMC__ )
#error "Your Watcom C can't preprocess 64-bit constants, use HB_USER_CFLAGS=-za99 or upgrade/downgrade"
#else
#error "Your C compiler wrongly preprocess 64-bit constants"
#endif
#endif #endif
/* HB_*_EXPLENGTH() macros are used by HVM to set the size of /* HB_*_EXPLENGTH() macros are used by HVM to set the size of
@@ -540,10 +544,10 @@ typedef HB_U32 HB_SYMCNT;
#endif #endif
#if ! defined( HB_LONG_LONG_OFF ) #if ! defined( HB_LONG_LONG_OFF )
# if HB_VMLONG_MAX > HB_LL( 9999999999 ) || defined( HB_WATCOM_64BUG ) # if HB_VMLONG_MAX > HB_LL( 9999999999 )
# define HB_LONG_LENGTH( l ) ( ( (l) < -999999999 || (l) > HB_LL( 9999999999 ) ) ? 20 : 10 ) # define HB_LONG_LENGTH( l ) ( ( (l) < -999999999 || (l) > HB_LL( 9999999999 ) ) ? 20 : 10 )
# endif # endif
# if HB_VMINT_MAX > HB_LL( 9999999999 ) && ! defined( HB_WATCOM_64BUG ) # if HB_VMINT_MAX > HB_LL( 9999999999 )
# define HB_INT_EXPLENGTH( i ) HB_LONG_LENGTH( i ) # define HB_INT_EXPLENGTH( i ) HB_LONG_LENGTH( i )
# endif # endif
#endif #endif