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

2009-03-14 16:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbgt/strasint.c
    % Using HB_ISDIGIT()
    ! Fixed to not include hbtrace.h directly.

  * make_gnu.bat
    % make clean and install phases merged in HB_BUILD_DLL mode.

  * bin/postinst.bat
    ! Fix to recent change.

  * include/hbdefs.h
    ! Moved #include hbtrace.h after HB_EXPORT is defined.
      (hack)
This commit is contained in:
Viktor Szakats
2009-03-14 15:17:52 +00:00
parent 5220b0740a
commit b17e5a0163
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -8,6 +8,21 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-14 16:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbgt/strasint.c
% Using HB_ISDIGIT()
! Fixed to not include hbtrace.h directly.
* make_gnu.bat
% make clean and install phases merged in HB_BUILD_DLL mode.
* bin/postinst.bat
! Fix to recent change.
* include/hbdefs.h
! Moved #include hbtrace.h after HB_EXPORT is defined.
(hack)
2009-03-14 15:04 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbfimage/fi_winfu.c
* contrib/hbfimage/fi_wrp.c

2
harbour/bin/postinst.bat
View File

@@ -27,7 +27,7 @@ goto inst_%HB_ARCHITECTURE%
rem Windows post install part
if not "%OS%" == "Windows_NT" goto end
if "%HB_BUILD_DLL%" == "yes" call %~dp0hb-mkdyn.bat
if "%HB_DYNLIB%" == "yes" call %~dp0hb-mkdyn.bat
set _HB_BIN_INSTALL=%HB_BIN_INSTALL%
if not "%HB_BIN_COMPILE%" == "" set HB_BIN_INSTALL=%HB_BIN_COMPILE%

8
harbour/contrib/hbgt/strasint.c
View File

@@ -9,9 +9,7 @@
* By......: David A Pearson *
*****************************************************************************/
#include "hbtrace.h"
#define ISDIGIT(c) ((c) >= '0' && (c) <= '9')
#include "hbapi.h"
int _GT_Internal_StringAsInt(char *String, int Start, int End)
{
@@ -20,10 +18,10 @@ int _GT_Internal_StringAsInt(char *String, int Start, int End)
int Value = 0;
HB_TRACE(HB_TR_DEBUG, ("_GT_Internal_StringAsInt(%s, %d, %d)", String, Start, End));
for (Digit = End; Digit >= Start; Digit--)
{
if (ISDIGIT(String[Digit]))
if (HB_ISDIGIT(String[Digit]))
{
Value += (String[Digit] - 0x30) * Decimal;
Decimal *= 0xA;

3
harbour/include/hbdefs.h
View File

@@ -60,7 +60,6 @@
#include <limits.h>
#include "hbsetup.h"
#include "hbtrace.h"
#include "hbver.h"
/* Compatibility. Do not use HB_OS_WIN_32_USED anymore. */
@@ -1382,4 +1381,6 @@ typedef BYTE HB_COLOR;
#define HB_ISFIRSTIDCHAR( c ) ( HB_ISALPHA( c ) || ( c ) == '_' )
#define HB_ISNEXTIDCHAR( c ) ( HB_ISFIRSTIDCHAR(c) || HB_ISDIGIT( c ) )
#include "hbtrace.h"
#endif /* HB_DEFS_H_ */

6
harbour/make_gnu.bat
View File

@@ -122,15 +122,13 @@ if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL%
set HB_DYNLIB=yes
set HB_CONTRIBLIBS=no
set HB_CONTRIB_ADDONS=
%_HB_MAKE% clean %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
%_HB_MAKE% install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
%_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
set HB_DYNLIB=no
set HB_CONTRIBLIBS=%_HB_CONTRIBLIBS%
set HB_CONTRIB_ADDONS=%_HB_CONTRIB_ADDONS%
set _HB_CONTRIBLIBS=
set _HB_CONTRIB_ADDONS=
%_HB_MAKE% clean %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
%_HB_MAKE% install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
%_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
goto MAKE_DONE
:SKIP_WINDLL