Author: David Schneider <[email protected]>
Branch: arm-backed-float
Changeset: r44283:87e844f3997d
Date: 2011-05-18 12:43 +0200
http://bitbucket.org/pypy/pypy/changeset/87e844f3997d/
Log: merge
diff --git a/pypy/translator/c/src/debug_print.c
b/pypy/translator/c/src/debug_print.c
--- a/pypy/translator/c/src/debug_print.c
+++ b/pypy/translator/c/src/debug_print.c
@@ -74,7 +74,7 @@
#ifndef _WIN32
- static long long pypy_read_timestamp(void)
+ long long pypy_read_timestamp(void)
{
# ifdef CLOCK_THREAD_CPUTIME_ID
struct timespec tspec;
diff --git a/pypy/translator/platform/arm.py b/pypy/translator/platform/arm.py
--- a/pypy/translator/platform/arm.py
+++ b/pypy/translator/platform/arm.py
@@ -77,7 +77,7 @@
log.message('executing sb2 ' + args)
else:
args = SB2ARGS + [str(executable)] + args
- log.message('executing ' + ' '.join(args))
+ log.message('executing sb2 ' + ' '.join(args))
returncode, stdout, stderr = _run_subprocess('sb2', args,
env)
return ExecutionResult(returncode, stdout, stderr)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
