diff options
| -rw-r--r-- | ext/extmk.rb | 10 | ||||
| -rw-r--r-- | win32/win32.h | 9 |
2 files changed, 8 insertions, 11 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 876433d280..3ff15514d7 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -1,4 +1,4 @@ -#! /usr/local/bin/ruby -s +#! /usr/local/bin/ruby # -*- ruby -*- $force_static = nil @@ -102,15 +102,11 @@ require 'getopts' getopts('', 'extstatic', 'make:', 'make-flags:') -$force_static = $OPT['extstatic'] +$force_static = $OPT['extstatic'] == 'static' $make = $OPT['make'] || $make $mflags = Shellwords.shellwords($OPT['make-flags'] || "") -if mflags = ENV["MAKEFLAGS"] - mflags, = mflags.split(nil, 2) -else - mflags = ENV["MFLAGS"] || "" -end +mflags = $mflags.grep(/^-([^-].*)/) {$1}.join $continue = mflags.include?(?k) $dryrun = mflags.include?(?n) diff --git a/win32/win32.h b/win32/win32.h index 41c3a40a2f..b0d03d0902 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -209,10 +209,8 @@ extern pid_t waitpid (pid_t, int *, int); extern int do_spawn(char *); extern int kill(int, int); extern pid_t rb_w32_getpid(void); -#ifndef __BORLANDC__ -extern int isinf(double); -extern int isnan(double); -#else + +#ifdef __BORLANDC__ #include <float.h> #ifndef isinf #define isinf !_finite @@ -246,6 +244,9 @@ extern int isnan(double); #define S_ISBLK(m) (((unsigned short)(m) & S_IFMT) == S_IFBLK) #define S_ISCHR(m) (((unsigned short)(m) & S_IFMT) == S_IFCHR) #define S_ISREG(m) (((unsigned short)(m) & S_IFMT) == S_IFREG) +#elif !defined __MINGW32__ || defined __NO_ISOCEXT +extern int isinf(double); +extern int isnan(double); #endif #if !defined S_IRUSR && !defined __MINGW32__ |