summaryrefslogtreecommitdiff
path: root/win32/dir.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 13:06:17 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 13:06:17 +0000
commit9848f0d0ca3b086383a0df3a5baed973b6bafa26 (patch)
tree152a08761b9f9f45cd1fec1d17c414d337a7205f /win32/dir.h
parent315bf4b6d726c7a26fe1ae75889056cba90cb472 (diff)
* win32/{dir.h,win32.c} (rb_w32_readdir): removed old rb_w32_readdir()
and renamed from rb_w32_readdir_with_enc(). [ruby-core:24864] [Feature #1927] * dir.c (READDIR): follow above change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/dir.h')
-rw-r--r--win32/dir.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/win32/dir.h b/win32/dir.h
index 12a0e92..0e1bff0 100644
--- a/win32/dir.h
+++ b/win32/dir.h
@@ -29,18 +29,17 @@ typedef struct {
DIR* rb_w32_opendir(const char*);
DIR* rb_w32_uopendir(const char*);
-struct direct* rb_w32_readdir(DIR *);
-struct direct* rb_w32_readdir_with_enc(DIR *, rb_encoding *);
+struct direct* rb_w32_readdir(DIR *, rb_encoding *);
long rb_w32_telldir(DIR *);
void rb_w32_seekdir(DIR *, long);
void rb_w32_rewinddir(DIR *);
void rb_w32_closedir(DIR *);
-#define opendir rb_w32_opendir
-#define readdir rb_w32_readdir
-#define telldir rb_w32_telldir
-#define seekdir rb_w32_seekdir
-#define rewinddir rb_w32_rewinddir
-#define closedir rb_w32_closedir
+#define opendir(s) rb_w32_opendir((s))
+#define readdir(d) rb_w32_readdir((d), 0)
+#define telldir(d) rb_w32_telldir((d))
+#define seekdir(d, l) rb_w32_seekdir((d), (l))
+#define rewinddir(d) rb_w32_rewinddir((d))
+#define closedir(d) rb_w32_closedir((d))
#endif /* RUBY_WIN32_DIR_H */