diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-04-01 16:22:13 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-04-01 16:22:13 +0000 |
| commit | 05e01403b378a170ac4d72e503e5e078f77627db (patch) | |
| tree | d4d201f94f577bc8991790bc5461c561d78278aa /dir.c | |
| parent | e4b541720658cbb3c13843fdf12dc6edc9f2f746 (diff) | |
| download | ruby-05e01403b378a170ac4d72e503e5e078f77627db.tar.gz ruby-05e01403b378a170ac4d72e503e5e078f77627db.tar.xz ruby-05e01403b378a170ac4d72e503e5e078f77627db.zip | |
* win32/win32.c: use ruby's opendir on mingw32.
* win32/dir.h, dir.c, Makefile: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -26,10 +26,10 @@ #include <unistd.h> #endif -#if HAVE_DIRENT_H +#if defined HAVE_DIRENT_H && !defined NT # include <dirent.h> # define NAMLEN(dirent) strlen((dirent)->d_name) -#elif HAVE_DIRECT_H +#elif defined HAVE_DIRECT_H && !defined NT # include <direct.h> # define NAMLEN(dirent) strlen((dirent)->d_name) #else @@ -44,7 +44,7 @@ # if HAVE_NDIR_H # include <ndir.h> # endif -# if defined(NT) && defined(_MSC_VER) +# if defined(NT) # include "win32/dir.h" # endif #endif |