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

2008-10-22 12:09 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* tests/wvtext.prg
    ! Fixed GT selection code.

  * contrib/rddsql/mysqldd.c
    + Added ugly hack to make it compile with MSVC.
    ! Fixed MSVC 64-bit warning.

  * source/rtl/gtapi.c
    * Minor formatting.
This commit is contained in:
Viktor Szakats
2008-10-22 10:09:59 +00:00
parent 5225f0bc5f
commit 1dcc52ab03
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -8,6 +8,17 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2008-10-22 12:09 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* tests/wvtext.prg
! Fixed GT selection code.
* contrib/rddsql/mysqldd.c
+ Added ugly hack to make it compile with MSVC.
! Fixed MSVC 64-bit warning.
* source/rtl/gtapi.c
* Minor formatting.
2008-10-22 23:01 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* harbour/tests/wvtext.prg
Updated to demonstrate multi-windows GT capabilities.

14
harbour/contrib/rddsql/mysqldd.c
View File

@@ -62,12 +62,17 @@ typedef int my_socket;
#include "mysql.h"
/* TOFIX: HACK to make it compile under MSVC to avoid 'invalid integer constant expression' errors. */
#if !defined( _MSC_VER )
#if sizeof( MYSQL_ROW_OFFSET ) != sizeof( void* )
#error "MySQLDD error: sizeof( MYSQL_ROW_OFFSET ) != sizeof( void* )"
#error "MySQLDD error: sizeof( MYSQL_ROW_OFFSET ) != sizeof( void* )"
#endif
#if sizeof( MYSQL_ROW ) != sizeof( void* )
#error "MySQLDD error: sizeof( MYSQL_ROW ) != sizeof( void* )"
#error "MySQLDD error: sizeof( MYSQL_ROW ) != sizeof( void* )"
#endif
#endif
#ifndef MYSQL_TYPE_NEWDECIMAL
@@ -85,7 +90,8 @@ static ERRCODE mysqlGetValue( SQLBASEAREAP pArea, USHORT uiIndex, PHB_ITEM pItem
static ERRCODE mysqlGetVarLen( SQLBASEAREAP pArea, USHORT uiIndex, ULONG * pLength );
static SDDNODE mysqldd = {
static SDDNODE mysqldd =
{
NULL,
"MYSQL",
(SDDFUNC_CONNECT) mysqlConnect,
@@ -283,7 +289,7 @@ static ERRCODE mysqlOpen( SQLBASEAREAP pArea )
{
pMyField = mysql_fetch_field_direct( (MYSQL_RES*) pArea->pResult, uiCount );
hb_strncpy( pBuffer, pMyField->name, 256 - 1 );
hb_strncpy( ( char * ) pBuffer, pMyField->name, 256 - 1 );
pFieldInfo.atomName = pBuffer;
pFieldInfo.atomName[ MAX_FIELD_NAME ] = '\0';
hb_strUpper( (char *) pFieldInfo.atomName, MAX_FIELD_NAME + 1 );

4
harbour/source/rtl/gtapi.c
View File

@@ -357,7 +357,7 @@ HB_EXPORT ERRCODE hb_gtGetColorStr( char * pszColorString )
hb_gt_BaseFree( pGT );
return SUCCESS;
}
pszColorString[0] = '\0';
pszColorString[ 0 ] = '\0';
return FAILURE;
}
@@ -390,7 +390,7 @@ HB_EXPORT ERRCODE hb_gtColorsToString( int * pColors, int iColorCount, char * ps
hb_gt_BaseFree( pGT );
return SUCCESS;
}
pszColorString[0] = '\0';
pszColorString[ 0 ] = '\0';
return FAILURE;
}

12
harbour/tests/wvtext.prg
View File

@@ -158,22 +158,14 @@ STATIC FUNCTION DispScreen()
PROCEDURE HB_GTSYS()
#ifdef __GTWVG__
REQUEST HB_GT_WVG
REQUEST HB_GT_WVG_DEFAULT
#else
REQUEST HB_GT_WVT
REQUEST HB_GT_WVT_DEFAULT
REQUEST HB_GT_WIN
#endif
RETURN
//----------------------------------------------------------------------//
#ifdef __GTWVG__
PROCEDURE HB_GT_WVG_DEFAULT()
RETURN
#else
PROCEDURE HB_GT_WVT_DEFAULT()
RETURN
#endif
//----------------------------------------------------------------------//
FUNCTION SetPalette( nMode )
Local aPalette := Hb_GtInfo( HB_GTI_PALETTE )