From 8a8cb0f0d9db4479541a979ff156b14be525bf7d Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 17 Sep 2007 00:54:20 +0000
Subject: [PATCH] Really fix missing INT_MAX declaration. And fix pma.jam test
 on Unix.

[SVN r39336]
---
 historic/jam/src/expand.c                     |  4 ++--
 .../jam/test/parallel_multifile_actions.jam   | 22 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/historic/jam/src/expand.c b/historic/jam/src/expand.c
index b93e34cc3..8e5b8794f 100644
--- a/historic/jam/src/expand.c
+++ b/historic/jam/src/expand.c
@@ -12,7 +12,7 @@
 # include "newstr.h"
 # include <assert.h>
 # include <stdlib.h>
-# include <stdio.h>
+# include <limits.h>
 
 # ifdef OS_CYGWIN
 #  include <sys/cygwin.h>
@@ -128,7 +128,7 @@ var_expand(
             at_buf = (char*)BJAM_MALLOC_ATOMIC(at_size + 1);
             at_len = var_string( in, at_buf, at_size, lol );
             at_size *= 2;
-        } while ( at_len < 0 && at_len < INT_MAX / 2 );
+        } while ( at_len < 0 && at_size < INT_MAX / 2 );
         /* Return the result as a single item list. */
         if ( at_len > 0 )
         {
diff --git a/historic/jam/test/parallel_multifile_actions.jam b/historic/jam/test/parallel_multifile_actions.jam
index 197c6c3e2..6792d0dc0 100644
--- a/historic/jam/test/parallel_multifile_actions.jam
+++ b/historic/jam/test/parallel_multifile_actions.jam
@@ -8,22 +8,30 @@ if ! $(BJAM_SUBTEST)
     assert "...found 5 targets...
 ...updating 4 targets...
 .gen. g1.generated
-001 
-002 
+001
+002
 .use.1 u1.user
-003 
+003
 .use.2 u2.user
-004 
+004
 ...updated 4 targets...
 " : (==) : [ SHELL "$(ARGV[1]) -f parallel_multifile_actions.jam -sBJAM_SUBTEST=1 -j2" ] ;
 }
 else
 {
-    actions .gen. { echo 001 & sleep 1 & echo 002 }
+    actions .gen. {
+echo 001
+sleep 1
+echo 002
+}
     rule .use.1 { DEPENDS $(<) : $(>) ; }
-    actions .use.1 { echo 003 }
+    actions .use.1 {
+echo 003
+}
     rule .use.2 { DEPENDS $(<) : $(>) ; }
-    actions .use.2 { echo 004 }
+    actions .use.2 {
+echo 004
+}
 
     .gen. g1.generated g2.generated ;
     .use.1 u1.user : g1.generated ;