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

2009-03-31 12:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/xhb/dbf2txt.c
    ! Fixed for Win64.

  * contrib/xhb/hbserv.c
    - Excluded for Win64 builds.

  * contrib/hbqt/generator/hbqtgen.prg
    * Minor formatting in generated code. (Using double quotes 
      in #include, CLASS -> CREATE CLASS, DATA -> VAR to follow 
      Class(y) syntax.)
This commit is contained in:
Viktor Szakats
2009-03-31 10:23:41 +00:00
parent ea90ff81f0
commit 0ae335dec9
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -8,6 +8,18 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-31 12:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/xhb/dbf2txt.c
! Fixed for Win64.
* contrib/xhb/hbserv.c
- Excluded for Win64 builds.
* contrib/hbqt/generator/hbqtgen.prg
* Minor formatting in generated code. (Using double quotes
in #include, CLASS -> CREATE CLASS, DATA -> VAR to follow
Class(y) syntax.)
2009-03-31 12:03 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+ config/wce
+ config/wce/dir.cf

7
harbour/contrib/hbqt/generator/hbqtgen.prg
View File

@@ -777,7 +777,7 @@ STATIC FUNCTION BuildHeader( txt_, nMode )
aadd( txt_, "" )
ELSEIF nMode == 1
aadd( txt_, "" )
aadd( txt_, "#include 'hbclass.ch'" )
aadd( txt_, '#include "hbclass.ch"' )
aadd( txt_, "" )
ELSEIF nMode == 2
/* Pure Header */
@@ -890,11 +890,11 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut )
aadd( txt_, '' )
n := ascan( cls_, {|e_| lower( e_[ 1 ] ) == 'inherit' } )
s := 'CLASS '+ cWidget + IF( n > 0, ' INHERIT ' + cls_[ n,2 ], '' )
s := 'CREATE CLASS '+ cWidget + IF( n > 0, ' INHERIT ' + cls_[ n,2 ], '' )
aadd( txt_, s )
aadd( txt_, '' )
aadd( txt_, ' DATA pPtr' )
aadd( txt_, ' VAR pPtr' )
aadd( txt_, '' )
aadd( txt_, ' METHOD New()' )
aadd( txt_, '' )
@@ -1937,4 +1937,3 @@ STATIC FUNCTION Build_Demo( cPathOut )
RETURN CreateTarget( cFile, txt_ )
/*----------------------------------------------------------------------*/

12
harbour/contrib/xhb/dbf2txt.c
View File

@@ -87,9 +87,9 @@ static char * hb_strescape( const char * szInput, int lLen, const char * cDelim
/* Export field values to text file */
#ifndef HB_CDP_SUPPORT_OFF
static BOOL hb_ExportVar( int handle, PHB_ITEM pValue, const char * cDelim, PHB_CODEPAGE cdp )
static BOOL hb_ExportVar( HB_FHANDLE handle, PHB_ITEM pValue, const char * cDelim, PHB_CODEPAGE cdp )
#else
static BOOL hb_ExportVar( int handle, PHB_ITEM pValue, const char * cDelim )
static BOOL hb_ExportVar( HB_FHANDLE handle, PHB_ITEM pValue, const char * cDelim )
#endif
{
switch( hb_itemType( pValue ) )
@@ -164,11 +164,11 @@ HB_FUNC( DBF2TEXT )
PHB_ITEM pFields = hb_param( 3, HB_IT_ARRAY );
const char * cDelim = hb_parc( 4 );
HB_FHANDLE handle = ( HB_FHANDLE ) hb_parnl( 5 );
const char * cSep = hb_parc( 6 );
int nCount = ( int ) hb_parnl( 7 );
HB_FHANDLE handle = ( HB_FHANDLE ) hb_parnint( 5 );
const char * cSep = hb_parc( 6 );
int nCount = hb_parni( 7 );
#ifndef HB_CDP_SUPPORT_OFF
PHB_CODEPAGE cdp = hb_cdpFind( ( char * ) hb_parc( 8 ) );
PHB_CODEPAGE cdp = hb_cdpFind( ( char * ) hb_parcx( 8 ) );
#endif
AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();

5
harbour/contrib/xhb/hbserv.c
View File

@@ -63,10 +63,11 @@
#include <stdio.h>
/* DOS, Darwin < 6.x and poccce can't compile this module */
/* These targets can't compile this module */
#if !defined( HB_OS_DOS ) && \
!defined( HB_OS_DARWIN_5 ) && \
! ( defined(HB_OS_WIN_CE) && defined(__POCC__) )
! ( defined(HB_OS_WIN_CE) && defined(__POCC__) ) && \
!defined( HB_OS_WIN_64 )
#if defined( HB_OS_UNIX ) || defined (HB_OS_OS2_GCC)
#include <sys/types.h>