1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/extmk.rb (create_makefile): check only `-' option.

Browse Source 
* configure.in: cleanups for MinGW. remove -D__NO_ISOCEXT in $CFLAGS.
* win32/win32.h: prototypes for isinf, isnan are not needed on MinGW.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2002-12-26 14:59:35 +00:00
parent b90bdc3e25
commit 220a9926c5
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/extmk.rb
View File

@ -1,4 +1,4 @@
#! /usr/local/bin/ruby -s #! /usr/local/bin/ruby
# -*- ruby -*- # -*- ruby -*-
$force_static = nil $force_static = nil
@ -102,15 +102,11 @@ require 'getopts'
getopts('', 'extstatic', 'make:', 'make-flags:') getopts('', 'extstatic', 'make:', 'make-flags:')
$force_static = $OPT['extstatic'] $force_static = $OPT['extstatic'] == 'static'
$make = $OPT['make'] || $make $make = $OPT['make'] || $make
$mflags = Shellwords.shellwords($OPT['make-flags'] || "") $mflags = Shellwords.shellwords($OPT['make-flags'] || "")
if mflags = ENV["MAKEFLAGS"] mflags = $mflags.grep(/^-([^-].*)/) {$1}.join
mflags, = mflags.split(nil, 2)
else
mflags = ENV["MFLAGS"] || ""
end
$continue = mflags.include?(?k) $continue = mflags.include?(?k)
$dryrun = mflags.include?(?n) $dryrun = mflags.include?(?n)

9
win32/win32.h
View File

@ -209,10 +209,8 @@ extern pid_t waitpid (pid_t, int *, int);
extern int do_spawn(char *); extern int do_spawn(char *);
extern int kill(int, int); extern int kill(int, int);
extern pid_t rb_w32_getpid(void); extern pid_t rb_w32_getpid(void);
#ifndef __BORLANDC__
extern int isinf(double); #ifdef __BORLANDC__
extern int isnan(double);
#else
#include <float.h> #include <float.h>
#ifndef isinf #ifndef isinf
#define isinf !_finite #define isinf !_finite
@ -246,6 +244,9 @@ extern int isnan(double);
#define S_ISBLK(m) (((unsigned short)(m) & S_IFMT) == S_IFBLK) #define S_ISBLK(m) (((unsigned short)(m) & S_IFMT) == S_IFBLK)
#define S_ISCHR(m) (((unsigned short)(m) & S_IFMT) == S_IFCHR) #define S_ISCHR(m) (((unsigned short)(m) & S_IFMT) == S_IFCHR)
#define S_ISREG(m) (((unsigned short)(m) & S_IFMT) == S_IFREG) #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 #endif
#if !defined S_IRUSR && !defined __MINGW32__ #if !defined S_IRUSR && !defined __MINGW32__