diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-15 11:09:47 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-15 11:09:47 +0000 |
| commit | 3d25acdccc6c6afec0649655859590892b561c9d (patch) | |
| tree | 571a87539732e51d4c3f51bc91eeb9c072b29073 /ext | |
| parent | e4081877a8240541fb47ef08095f73db3e156325 (diff) | |
* io.c, thread.c, ext/pty/pty.c, ext/fiddle/closure.c: use
__linux__ macro for consistency.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/fiddle/closure.c | 2 | ||||
| -rw-r--r-- | ext/pty/pty.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c index 542d978395..962f9267fe 100644 --- a/ext/fiddle/closure.c +++ b/ext/fiddle/closure.c @@ -10,7 +10,7 @@ typedef struct { ffi_type **argv; } fiddle_closure; -#if defined(MACOSX) || defined(__linux) || defined(__OpenBSD__) +#if defined(MACOSX) || defined(__linux__) || defined(__OpenBSD__) #define DONT_USE_FFI_CLOSURE_ALLOC #endif diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 4b28fd9f29..d7e6f3d8bb 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -256,7 +256,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if ((slavefd = rb_cloexec_open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error; rb_update_max_fd(slavefd); -#if defined I_PUSH && !defined linux +#if defined(I_PUSH) && !defined(__linux__) if (ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; if (ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error; if (ioctl(slavefd, I_PUSH, "ttcompat") == -1) goto error; @@ -340,7 +340,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if (no_mesg(slavedevice, nomesg) == -1) goto error; if((slavefd = rb_cloexec_open(slavedevice, O_RDWR, 0)) == -1) goto error; rb_update_max_fd(slavefd); -#if defined I_PUSH && !defined linux +#if defined(I_PUSH) && !defined(__linux__) if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error; ioctl(slavefd, I_PUSH, "ttcompat"); |