diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-21 16:47:13 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-21 16:47:13 +0000 |
commit | 1ce26d09fe53acce08905ead8e5ebee39d82456a (patch) | |
tree | 1220f0a2645c32eab5eab983646b7c88faf17ef1 /file.c | |
parent | cc24146adc931f1797c8469faa9fa9e68c8d4a47 (diff) | |
download | ruby-1ce26d09fe53acce08905ead8e5ebee39d82456a.tar.gz |
* file.c (rb_file_s_basename): DOSISH_UNC is defined on cygwin but
DOSISH is not. fixed: [ruby-dev:27797]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2573,7 +2573,7 @@ rb_file_s_basename(int argc, VALUE *argv) { VALUE fname, fext, basename; char *name, *p; -#ifdef DOSISH +#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC char *root; #endif int f; @@ -2585,7 +2585,7 @@ rb_file_s_basename(int argc, VALUE *argv) if (RSTRING(fname)->len == 0 || !*(name = RSTRING(fname)->ptr)) return fname; name = skipprefix(name); -#ifdef DOSISH +#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC root = name; #endif while (isdirsep(*name)) @@ -2593,7 +2593,7 @@ rb_file_s_basename(int argc, VALUE *argv) if (!*name) { p = name - 1; f = 1; -#ifdef DOSISH +#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC if (name != root) { /* has slashes */ } |