diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-09 15:52:49 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-09 15:52:49 +0000 |
| commit | 3e1d8aab1731e671b8daf266bbdb99196ff95421 (patch) | |
| tree | 8799c74bdd5f62ca9cd059b374cdda6ef59272bf /io.c | |
| parent | f40412e258012af48595fab97ac23365b9b117ec (diff) | |
* dln.c: Simplify and make consistent an ifdef for Mac OS X.
* ext/socket/rubysocket.h: ditto.
* ext/tk/stubs.c: ditto.
* io.c: ditto.
* process.c: ditto.
* signal.c: ditto.
* vm_dump.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
| -rw-r--r-- | io.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -4010,8 +4010,7 @@ rb_io_close(VALUE io) if (fptr->fd < 0) return Qnil; fd = fptr->fd; -#if defined __APPLE__ && defined(__MACH__) && \ - (!defined(MAC_OS_X_VERSION_MIN_ALLOWED) || MAC_OS_X_VERSION_MIN_ALLOWED <= 1050) +#if defined __APPLE__ && (!defined(MAC_OS_X_VERSION_MIN_ALLOWED) || MAC_OS_X_VERSION_MIN_ALLOWED <= 1050) /* close(2) on a fd which is being read by another thread causes * deadlock on Mac OS X 10.5 */ rb_thread_fd_close(fd); |