diff --git a/io.c b/io.c index f8b93c65b5e..09e50dc74e7 100644 --- a/io.c +++ b/io.c @@ -61,10 +61,10 @@ #endif #include -#if defined(HAVE_SYS_IOCTL_H) && !defined(_WIN32) +#ifdef HAVE_SYS_IOCTL_H #include #endif -#if defined(HAVE_FCNTL_H) || defined(_WIN32) +#if defined(HAVE_FCNTL_H) #include #elif defined(HAVE_SYS_FCNTL_H) #include @@ -7531,7 +7531,6 @@ rb_pipe(int *pipes) } #ifdef _WIN32 -#define HAVE_SPAWNV 1 #define spawnv(mode, cmd, args) rb_w32_uaspawn((mode), (cmd), (args)) #define spawn(mode, cmd) rb_w32_uspawn((mode), (cmd), 0) #endif diff --git a/process.c b/process.c index b4f9c2bced0..03e20d2e2cf 100644 --- a/process.c +++ b/process.c @@ -125,7 +125,7 @@ int initgroups(const char *, rb_gid_t); #define open rb_w32_uopen #endif -#if defined(HAVE_TIMES) || defined(_WIN32) +#if defined(HAVE_TIMES) /********************************************************************* * * Document-class: Process::Tms @@ -9566,7 +9566,7 @@ InitVM_process(void) rb_define_module_function(rb_mProcess, "clock_gettime", rb_clock_gettime, -1); rb_define_module_function(rb_mProcess, "clock_getres", rb_clock_getres, -1); -#if defined(HAVE_TIMES) || defined(_WIN32) +#if defined(HAVE_TIMES) rb_cProcessTms = rb_struct_define_under(rb_mProcess, "Tms", "utime", "stime", "cutime", "cstime", NULL); #if 0 /* for RDoc */ /* user time used in this process */