[pypy-commit] cffi release-1.4: hg merge default

2015-12-21 Thread arigo
Author: Armin Rigo Branch: release-1.4 Changeset: r2492:2a74753abaa9 Date: 2015-12-21 19:04 +0100 http://bitbucket.org/cffi/cffi/changeset/2a74753abaa9/ Log:hg merge default diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c --- a/c/_cffi_backend.c +++ b/c/_cffi_backend.c @@ -6498,7 +6498,7

[pypy-commit] cffi release-1.4: hg merge default

2015-12-17 Thread arigo
Author: Armin Rigo Branch: release-1.4 Changeset: r2487:77c28957c976 Date: 2015-12-17 16:26 +0100 http://bitbucket.org/cffi/cffi/changeset/77c28957c976/ Log:hg merge default diff --git a/c/misc_thread_posix.h b/c/misc_thread_posix.h --- a/c/misc_thread_posix.h +++ b/c/misc_thread_posix.h @@