From c0af40dd921cabc1fb21d226ff65b9fcf163376f Mon Sep 17 00:00:00 2001
From: Patrick Mast <harbour@winfakt.com>
Date: Sun, 18 Jul 1999 12:51:03 +0000
Subject: [PATCH] /source/hbpp     latest files from Alexander

---
 harbour/ChangeLog             | 4 ++++
 harbour/source/hbpp/hbpp.c    | 4 ++--
 harbour/source/hbpp/hbppint.c | 8 +++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 08982bc59a..fdf16bd911 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+19990718-14:13 CET Patrick Mast <harbour@PatrickMast.com>
+  * /source/hbpp
+    latest files from Alexander. With these files Build32.bat works ok.
+
 19990718-14:22 CET Eddie Runia <eddie@runia.com>
   * tests/working/run_all.bat
     Harbour compile added
diff --git a/harbour/source/hbpp/hbpp.c b/harbour/source/hbpp/hbpp.c
index b695beae72..2ee577b027 100644
--- a/harbour/source/hbpp/hbpp.c
+++ b/harbour/source/hbpp/hbpp.c
@@ -544,11 +544,11 @@ int ParseExpression( char* sLine, char* sOutLine )
    if ( (stdef=DefSearch(sToken)) != NULL )
    {
      for(i=0;i<kolused;i++) if ( aUsed[i] == stdef ) break;
-     /*if ( i < kolused )
+     if ( i < kolused )
      {
        if ( i < lastused ) GenError( _szPErrors, 'P', ERR_RECURSE, NULL, NULL );
      }
-     else */if ( WorkDefine ( &ptri, &ptro, stdef, lenToken ) )
+     if ( WorkDefine ( &ptri, &ptro, stdef, lenToken ) )
      {
        aUsed[kolused++] = stdef;
        rezDef++;
diff --git a/harbour/source/hbpp/hbppint.c b/harbour/source/hbpp/hbppint.c
index a82bb38659..8de3a49a78 100644
--- a/harbour/source/hbpp/hbppint.c
+++ b/harbour/source/hbpp/hbppint.c
@@ -25,12 +25,13 @@
    their web site at http://www.gnu.org/).
  */
 
-#include <stdlib.h>
 #if defined(__GNUC__)
  #include <string.h>
+ #include <stdlib.h>
 #else
  #if (defined(_MSC_VER) || defined(__IBMCPP__) || defined(__WATCOMC__))
   #include <memory.h>
+  #include <stdlib.h>
  #else
   #include <alloc.h>
   #include <mem.h>
@@ -65,6 +66,7 @@ extern TRANSLATES *aTranslates ;
 
 int iBuffer, lenBuffer;
 int lPpo = 0;
+char sLine[STR_SIZE], sOutLine[STR_SIZE];
 FILE *yyppo;
 
 void Hbpp_init ( void )
@@ -79,7 +81,7 @@ void Hbpp_init ( void )
 int PreProcess( FILE* handl_i, FILE* handl_o, char *sOut )
 {
  static char sBuffer[BUFF_SIZE];           /* File read buffer */
- char sLine[STR_SIZE], sOutLine[STR_SIZE], *ptr, *ptrOut = sOut;
+ char *ptr, *ptrOut = sOut;
  int lContinue = 0;
  int lens=0, rdlen;
  int rezParse;
@@ -141,7 +143,7 @@ int PreProcess( FILE* handl_i, FILE* handl_o, char *sOut )
 int Hp_Parse( FILE* handl_i, FILE* handl_o )
 {
  char sBuffer[BUFF_SIZE];           /* File read buffer */
- char sLine[STR_SIZE], *ptr;
+ char *ptr;
  int lContinue = 0;
  int iBuffer = 10, lenBuffer = 10;
  int lens=0, rdlen;