Author: Armin Rigo <[email protected]>
Branch: py3k
Changeset: r86714:04cb05574b89
Date: 2016-08-29 21:20 +0200
http://bitbucket.org/pypy/pypy/changeset/04cb05574b89/
Log: hg merge default
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -623,7 +623,8 @@
class CConfig:
_compilation_info_ = eci
DIRENT = rffi_platform.Struct('struct dirent',
- [('d_name', lltype.FixedSizeArray(rffi.CHAR, 1))]
+ [('d_name', lltype.FixedSizeArray(rffi.CHAR, 1)),
+ ('d_ino', lltype.Signed)]
+ [('d_type', rffi.INT)] if HAVE_D_TYPE else [])
if HAVE_D_TYPE:
DT_UNKNOWN = rffi_platform.ConstantInteger('DT_UNKNOWN')
diff --git a/rpython/rlib/rposix_scandir.py b/rpython/rlib/rposix_scandir.py
--- a/rpython/rlib/rposix_scandir.py
+++ b/rpython/rlib/rposix_scandir.py
@@ -50,3 +50,6 @@
if rposix.HAVE_D_TYPE:
return rffi.getintfield(direntp, 'c_d_type')
return DT_UNKNOWN
+
+def get_inode(direntp):
+ return rffi.getintfield(direntp, 'c_d_ino')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
