[pypy-commit] pypy default: Backed out changeset 9daab4fb1be1

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r55787:64f5d48272b8
Date: 2012-06-23 18:18 +0200
http://bitbucket.org/pypy/pypy/changeset/64f5d48272b8/

Log:	Backed out changeset 9daab4fb1be1

	importing util.h seems not to work on all Mac OS systems

diff --git a/pypy/rpython/module/ll_os.py b/pypy/rpython/module/ll_os.py
--- a/pypy/rpython/module/ll_os.py
+++ b/pypy/rpython/module/ll_os.py
@@ -133,24 +133,18 @@
     _WIN32 = True
 else:
     _WIN32 = False
+
 if _WIN32:
     underscore_on_windows = '_'
 else:
     underscore_on_windows = ''
 
-_DARWIN = sys.platform.startswith('darwin')
-
 includes = []
 if not _WIN32:
     # XXX many of these includes are not portable at all
     includes += ['dirent.h', 'sys/stat.h',
                  'sys/times.h', 'utime.h', 'sys/types.h', 'unistd.h',
-                 'signal.h', 'sys/wait.h', 'fcntl.h']
-    if _DARWIN:
-        includes += ['util.h']
-    else:
-        includes += ['pty.h']
-
+                 'signal.h', 'sys/wait.h', 'fcntl.h', 'pty.h']
 else:
     includes += ['sys/utime.h']