From 00c92c17112e986f027584ec52f6016ca06a5631 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 22 Jun 2010 02:49:22 +0000
Subject: [PATCH] 2010-06-22 04:48 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * src/common/expropt1.c   * src/compiler/genc.c   *
 src/compiler/gencc.c   * include/hbexpra.c     + Use HB_PFS format string for
 HB_SIZE values.

  * src/common/Makefile
    * Sorted.
---
 harbour/ChangeLog             | 10 ++++++++++
 harbour/include/hbexpra.c     |  2 +-
 harbour/src/common/Makefile   | 10 +++++-----
 harbour/src/common/expropt1.c |  2 +-
 harbour/src/compiler/genc.c   |  2 +-
 harbour/src/compiler/gencc.c  |  6 +++---
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 772ab0a7b5..72e2f5fe9b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-22 04:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/common/expropt1.c
+  * src/compiler/genc.c
+  * src/compiler/gencc.c
+  * include/hbexpra.c
+    + Use HB_PFS format string for HB_SIZE values.
+
+  * src/common/Makefile
+    * Sorted.
+
 2010-06-22 04:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbhash.h
   * src/common/hbhash.c
diff --git a/harbour/include/hbexpra.c b/harbour/include/hbexpra.c
index d3322e7d7b..f1af88039c 100644
--- a/harbour/include/hbexpra.c
+++ b/harbour/include/hbexpra.c
@@ -630,7 +630,7 @@ HB_EXPR_PTR hb_compExprAssignStatic( HB_EXPR_PTR pLeftExpr, HB_EXPR_PTR pRightEx
 
 HB_EXPR_PTR hb_compExprSetCodeblockBody( HB_EXPR_PTR pExpr, HB_BYTE * pCode, HB_SIZE ulLen )
 {
-   HB_TRACE(HB_TR_DEBUG, ("hb_compExprSetCodeblockBody(%p,%p,%lu)", pExpr, pCode, ulLen));
+   HB_TRACE(HB_TR_DEBUG, ("hb_compExprSetCodeblockBody(%p,%p,%" HB_PFS "u)", pExpr, pCode, ulLen));
 
    pExpr->value.asCodeblock.string = ( char * ) hb_xgrab( ulLen + 1 );
    memcpy( pExpr->value.asCodeblock.string, pCode, ulLen );
diff --git a/harbour/src/common/Makefile b/harbour/src/common/Makefile
index 3c9b6b5513..ea8d006394 100644
--- a/harbour/src/common/Makefile
+++ b/harbour/src/common/Makefile
@@ -8,21 +8,21 @@ C_SOURCES := \
    expropt1.c \
    expropt2.c \
    funcid.c \
+   hbarch.c \
+   hbdate.c \
    hbffind.c \
    hbfopen.c \
    hbfsapi.c \
    hbgete.c \
-   hbwin.c \
-   hbwince.c \
    hbhash.c \
+   hbmem.c \
    hbprintf.c \
    hbstr.c \
-   hbdate.c \
-   hbmem.c \
    hbtrace.c \
    hbver.c \
    hbverdsp.c \
-   hbarch.c \
+   hbwin.c \
+   hbwince.c \
    strwild.c \
 
 LIBNAME := hbcommon
diff --git a/harbour/src/common/expropt1.c b/harbour/src/common/expropt1.c
index 78b510e1ee..2d8b27fc3b 100644
--- a/harbour/src/common/expropt1.c
+++ b/harbour/src/common/expropt1.c
@@ -460,7 +460,7 @@ HB_EXPR_PTR hb_compExprNewCodeBlock( char *string, HB_SIZE ulLen, int iFlags, HB
 {
    HB_EXPR_PTR pExpr;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_compExprNewCodeBlock(%s,%lu,%d,%p)",string, ulLen, iFlags, HB_COMP_PARAM));
+   HB_TRACE(HB_TR_DEBUG, ("hb_compExprNewCodeBlock(%s,%" HB_PFS "u,%d,%p)",string, ulLen, iFlags, HB_COMP_PARAM));
 
    pExpr = HB_COMP_EXPR_NEW( HB_ET_CODEBLOCK );
 
diff --git a/harbour/src/compiler/genc.c b/harbour/src/compiler/genc.c
index a8ad31a737..fcd1f242ab 100644
--- a/harbour/src/compiler/genc.c
+++ b/harbour/src/compiler/genc.c
@@ -1749,7 +1749,7 @@ static HB_GENC_FUNC( hb_p_pushstrlarge )
             pFunc->pCode[ lPCodePos + 3 ] );
 
    if( cargo->bVerbose )
-         fprintf( cargo->yyc, "\t/* %lu */", ulLen );
+         fprintf( cargo->yyc, "\t/* %" HB_PFS "u */", ulLen );
 
    if( ulLen > 0 )
    {
diff --git a/harbour/src/compiler/gencc.c b/harbour/src/compiler/gencc.c
index 7d0e074bd1..810099c709 100644
--- a/harbour/src/compiler/gencc.c
+++ b/harbour/src/compiler/gencc.c
@@ -1096,7 +1096,7 @@ static HB_GENC_FUNC( hb_p_pushblocklarge )
    ulSize = HB_PCODE_MKUINT24( &pFunc->pCode[ lPCodePos + 1 ] ) - 4;
    lPCodePos += 4;
 
-   fprintf( cargo->yyc, "\t{\n\t\tstatic const HB_BYTE codeblock[ %lu ] = {", ulSize );
+   fprintf( cargo->yyc, "\t{\n\t\tstatic const HB_BYTE codeblock[ %" HB_PFS "u ] = {", ulSize );
 
    for( ul = 0; ul < ulSize; ++ul )
    {
@@ -1378,7 +1378,7 @@ static HB_GENC_FUNC( hb_p_pushstrlarge )
 
    fprintf( cargo->yyc, "\thb_xvmPushStringConst( " );
    hb_compGenCString( cargo->yyc, &pFunc->pCode[ lPCodePos + 4 ], ulLen );
-   fprintf( cargo->yyc, ", %lu );\n", ulLen );
+   fprintf( cargo->yyc, ", %" HB_PFS "u );\n", ulLen );
 
    return 5 + ulLen;
 }
@@ -1647,7 +1647,7 @@ static HB_GENC_FUNC( hb_p_threadstatics )
    w = HB_PCODE_MKUSHORT( &pFunc->pCode[ lPCodePos + 1 ] );
    ulSize = ( HB_SIZE ) w << 1;
 
-   fprintf( cargo->yyc, "\t{\n\t\tstatic const HB_BYTE statics[ %lu ] = {", ulSize );
+   fprintf( cargo->yyc, "\t{\n\t\tstatic const HB_BYTE statics[ %" HB_PFS "u ] = {", ulSize );
 
    for( ul = 0; ul < ulSize; ++ul )
    {