diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-09-03 07:43:53 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-09-03 07:43:53 +0000 |
commit | f5da3b6746dba18ab86d11aa49caf97b37ecc6ac (patch) | |
tree | 1c472d11ebd04c612140d228a7a5414d3a08e615 /glob.c | |
parent | 264c52f2e6abc33f09e6a891f67bdf7bddbae406 (diff) |
1.1c4
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'glob.c')
-rw-r--r-- | glob.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -46,6 +46,9 @@ #if defined (HAVE_DIRENT_H) # include <dirent.h> # define D_NAMLEN(d) strlen ((d)->d_name) +#elif HAVE_DIRECT_H +# include <direct.h> +# define D_NAMLEN(d) strlen ((d)->d_name) #else /* !HAVE_DIRENT_H */ # define D_NAMLEN(d) ((d)->d_namlen) # if defined (HAVE_SYS_NDIR_H) @@ -66,6 +69,8 @@ /* Posix does not require that the d_ino field be present, and some systems do not provide it. */ # define REAL_DIR_ENTRY(dp) 1 +#elif defined (__BORLANDC__) +# define REAL_DIR_ENTRY(dp) 1 #else # define REAL_DIR_ENTRY(dp) (dp->d_ino != 0) #endif /* _POSIX_SOURCE */ @@ -111,7 +116,7 @@ extern void throw_to_top_level (); extern int interrupt_state; #endif /* SHELL */ -#if defined(NT) +#if defined(NT) && defined(_MSC_VER) #include "missing/dir.h" #endif |