Author: Ronan Lamy <[email protected]>
Branch: py3.3
Changeset: r79805:7ac40865b0ff
Date: 2015-09-23 20:54 +0100
http://bitbucket.org/pypy/pypy/changeset/7ac40865b0ff/
Log: merge heads
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -249,7 +249,7 @@
else:
includes = ['unistd.h', 'sys/types.h', 'sys/wait.h',
'utime.h', 'sys/time.h', 'sys/times.h',
- 'grp.h', 'dirent.h']
+ 'grp.h', 'dirent.h', 'pty.h']
libraries = ['util']
eci = ExternalCompilationInfo(
includes=includes,
@@ -1659,19 +1659,23 @@
finally:
lltype.free(l_utsbuf, flavor='raw')
+# These are actually macros on some/most systems
c_makedev = external('makedev', [rffi.INT, rffi.INT], rffi.INT)
c_major = external('major', [rffi.INT], rffi.INT)
c_minor = external('minor', [rffi.INT], rffi.INT)
@replace_os_function('makedev')
[email protected]_look_inside
def makedev(maj, min):
return c_makedev(maj, min)
@replace_os_function('major')
[email protected]_look_inside
def major(dev):
return c_major(dev)
@replace_os_function('minor')
[email protected]_look_inside
def minor(dev):
return c_minor(dev)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
