Author: Ronan Lamy <[email protected]>
Branch:
Changeset: r68378:26582ea5fc1d
Date: 2013-12-05 00:14 +0000
http://bitbucket.org/pypy/pypy/changeset/26582ea5fc1d/
Log: Merged in vext01/pypy/timeb_h (pull request #202)
OpenBSD will no longer have <sys/timeb.h> soon.
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -32,3 +32,7 @@
.. branch: better_ftime_detect2
On OpenBSD do not pull in libcompat.a as it is about to be removed.
And more generally, if you have gettimeofday(2) you will not need ftime(3).
+
+.. branch: timeb_h
+Remove dependency upon <sys/timeb.h> on OpenBSD. This will be disappearing
+along with libcompat.a.
diff --git a/rpython/rtyper/module/ll_time.py b/rpython/rtyper/module/ll_time.py
--- a/rpython/rtyper/module/ll_time.py
+++ b/rpython/rtyper/module/ll_time.py
@@ -24,8 +24,12 @@
FTIME = 'ftime'
STRUCT_TIMEB = 'struct timeb'
includes = [TIME_H, 'time.h', 'errno.h', 'sys/select.h',
- 'sys/types.h', 'unistd.h', 'sys/timeb.h',
+ 'sys/types.h', 'unistd.h',
'sys/time.h', 'sys/resource.h']
+
+ if not sys.platform.startswith("openbsd"):
+ includes.append('sys/timeb.h')
+
need_rusage = True
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
