[patch] Updated variant of the patch

1.34.1-fix_few_bugs.patch (text/plain), 4.40 KB, created by Alexander Bezrukov on 2009-03-12 02:20:08 UTC

diff -urN src/builtins.c /tmp/src/builtins.c
--- src/builtins.c	2006-08-28 23:33:41.000000000 +0400
+++ /tmp/src/builtins.c	2009-03-11 21:48:31.000000000 +0300
@@ -4,6 +4,8 @@
  * This file is part of Jam - see jam.c for Copyright information.
  */
 
+# include <ctype.h>
+
 # include "jam.h"
 # include "debug.h"
 
@@ -24,7 +26,8 @@
 # include "compile.h"
 # include "native.h"
 # include "variable.h"
-# include <ctype.h>
+# include "timestamp.h"
+# include "modules/modules.h"
 
 /*
  * builtins.c - builtin jam rules
diff -urN src/builtins.h /tmp/src/builtins.h
--- src/builtins.h	2005-09-28 18:09:58.000000000 +0400
+++ /tmp/src/builtins.h	2009-03-11 21:48:31.000000000 +0300
@@ -51,4 +51,6 @@
 
 void backtrace( FRAME *frame );
 
+void lol_build( LOL* lol, char** elements );
+
 #endif
diff -urN src/compile.c /tmp/src/compile.c
--- src/compile.c	2005-10-03 04:47:36.000000000 +0400
+++ /tmp/src/compile.c	2009-03-11 21:48:31.000000000 +0300
@@ -1319,7 +1319,7 @@
 debug_compile( int which, char *s, FRAME* frame )
 {
     static int level = 0;
-    static char indent[36] = ">>>>|>>>>|>>>>|>>>>|>>>>|>>>>|>>>>|";
+    static const char indent[36] = ">>>>|>>>>|>>>>|>>>>|>>>>|>>>>|>>>>|";
 
     if ( which >= 0 )
     {
diff -urN src/debug.c /tmp/src/debug.c
--- src/debug.c	2005-10-03 04:47:36.000000000 +0400
+++ /tmp/src/debug.c	2009-03-11 21:48:31.000000000 +0300
@@ -107,8 +107,8 @@
         profile_total.memory += p->memory;
     }
     printf("%10d %10d %10d %12.6f %10d %10d %s\n",
-        p->num_entries, p->cumulative, p->net, q,
-        p->memory, mem_each,
+        (int) p->num_entries, (int) p->cumulative, (int) p->net, q,
+        (int) p->memory, (int) mem_each,
         p->name);
 }
 
diff -urN src/expand.c /tmp/src/expand.c
--- src/expand.c	2006-01-27 21:47:39.000000000 +0300
+++ /tmp/src/expand.c	2009-03-11 21:48:31.000000000 +0300
@@ -86,7 +86,7 @@
     int depth;
 
     if( DEBUG_VAREXP )
-        printf( "expand '%.*s'\n", end - in, in );
+        printf( "expand '%.*s'\n", (int)(end - in), in );
 
     /* This gets alot of cases: $(<) and $(>) */
 
diff -urN src/hash.c /tmp/src/hash.c
--- src/hash.c	2005-10-03 04:47:36.000000000 +0400
+++ /tmp/src/hash.c	2009-03-11 21:48:31.000000000 +0300
@@ -366,6 +366,6 @@
 		hp->items.nel,
 		hp->tab.nel,
 		hp->items.nel * hp->items.size / 1024,
-		hp->tab.nel * sizeof( ITEM ** ) / 1024,
+		hp->tab.nel * (int)sizeof( ITEM ** ) / 1024,
 		(float)count / (float)sets );
 }
diff -urN src/make1.c /tmp/src/make1.c
--- src/make1.c	2005-10-03 04:47:36.000000000 +0400
+++ /tmp/src/make1.c	2009-03-11 21:48:31.000000000 +0300
@@ -61,6 +61,9 @@
 # include "command.h"
 # include "execcmd.h"
 
+# include "debug.h"
+# include "compile.h"
+
 # include <stdlib.h>
 
 #if defined(sun) || defined(__sun)
@@ -960,7 +963,7 @@
 			list_sublist( ns, start, chunk ),
 			list_new( L0, newstr( "%" ) ) );
 
-                    printf( cmd->buf );
+                    printf( "%s", cmd->buf );
                 
 		    exit( EXITBAD );
 		}
diff -urN src/modules/modules.h /tmp/src/modules/modules.h
--- src/modules/modules.h	1970-01-01 03:00:00.000000000 +0300
+++ /tmp/src/modules/modules.h	2009-03-11 21:48:31.000000000 +0300
@@ -0,0 +1,7 @@
+void init_order();
+void init_path();
+void init_property_set();
+void init_regex();
+void init_sequence();
+void init_set();
+
diff -urN src/native.c /tmp/src/native.c
--- src/native.c	2005-09-28 18:09:58.000000000 +0400
+++ /tmp/src/native.c	2009-03-11 21:48:31.000000000 +0300
@@ -3,6 +3,7 @@
 /* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */
 
 #include "native.h"
+#include "builtins.h"
 #include "hash.h"
 
 # define P0 (PARSE *)0
diff -urN src/newstr.c /tmp/src/newstr.c
--- src/newstr.c	2005-10-03 04:47:36.000000000 +0400
+++ /tmp/src/newstr.c	2009-03-11 21:48:31.000000000 +0300
@@ -4,12 +4,14 @@
  * This file is part of Jam - see jam.c for Copyright information.
  */
 
+# include <stddef.h>
+# include <stdlib.h>
+
 # include "jam.h"
 # include "newstr.h"
 # include "hash.h"
 # include "compile.h"
-# include <stddef.h>
-# include <stdlib.h>
+# include "debug.h"
 
 /*
  * newstr.c - string manipulation routines
diff -urN src/timestamp.h /tmp/src/timestamp.h
--- src/timestamp.h	2001-11-06 18:36:16.000000000 +0300
+++ /tmp/src/timestamp.h	2009-03-11 21:48:31.000000000 +0300
@@ -8,5 +8,7 @@
  * timestamp.h - get the timestamp of a file or archive member
  */
 
+#include <time.h>
+
 void timestamp( char *target, time_t *time );
 void donestamps();