diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-05-29 09:11:18 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-05-29 09:11:18 +0000 |
| commit | e617fd0bf84f80de8fc40a1ea86e96bd2848493a (patch) | |
| tree | 1bd18eee6123390a0e581e6ba48c655c8614d034 /win32 | |
| parent | 9a4786104165f7f6b15cc26e349d138e465dacf2 (diff) | |
* win32/win32.c (_CRTIMP): redefine _CRTIMP on MinGW.
* configure.in: remove '-D__USE_CRTIMP' from XCFLAGS on MinGW.
* win32/win32.c (NtMakeCmdVector): handle quotes only if not instring.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/win32/win32.c b/win32/win32.c index 1441a25c2b..7fa962f15b 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1213,7 +1213,7 @@ NtMakeCmdVector (char *cmdline, char ***vec, int InputCmd) // we can remove them. // - if (InputCmd && (base[0] == '\"' && base[len-1] == '\"')) { + if (InputCmd && !instring && (base[0] == '\"' && base[len-1] == '\"')) { char *p; base++; len -= 2; @@ -1225,7 +1225,7 @@ NtMakeCmdVector (char *cmdline, char ***vec, int InputCmd) } } } - else if (InputCmd && (base[0] == '\'' && base[len-1] == '\'')) { + else if (InputCmd && !instring && (base[0] == '\'' && base[len-1] == '\'')) { base++; len -= 2; } @@ -1562,7 +1562,8 @@ typedef struct { #endif } ioinfo; -#if !defined _CRTIMP +#if !defined _CRTIMP || defined __MINGW32__ +#undef _CRTIMP #define _CRTIMP __declspec(dllimport) #endif |