Author: mattip <matti.pi...@gmail.com>
Branch: cpyext-ext
Changeset: r83750:2e474b62e455
Date: 2016-04-18 21:09 +0300
http://bitbucket.org/pypy/pypy/changeset/2e474b62e455/
Log: merge default into branch
diff --git a/lib_pypy/_resource_build.py b/lib_pypy/_resource_build.py
--- a/lib_pypy/_resource_build.py
+++ b/lib_pypy/_resource_build.py
@@ -86,20 +86,20 @@
} my_rlimit_consts[];
struct rusage {
- long ru_maxrss;
- long ru_ixrss;
- long ru_idrss;
- long ru_isrss;
- long ru_minflt;
- long ru_majflt;
- long ru_nswap;
- long ru_inblock;
- long ru_oublock;
- long ru_msgsnd;
- long ru_msgrcv;
- long ru_nsignals;
- long ru_nvcsw;
- long ru_nivcsw;
+ long ru_maxrss;
+ long ru_ixrss;
+ long ru_idrss;
+ long ru_isrss;
+ long ru_minflt;
+ long ru_majflt;
+ long ru_nswap;
+ long ru_inblock;
+ long ru_oublock;
+ long ru_msgsnd;
+ long ru_msgrcv;
+ long ru_nsignals;
+ long ru_nvcsw;
+ long ru_nivcsw;
...;
};
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
