diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-15 03:35:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-15 03:35:55 +0000 |
| commit | 9cee075559b547c08073c0ecda2e4a98f4cffe24 (patch) | |
| tree | 90c12fffd61ce076cf2efbd6f2042ab375ba633e /win32 | |
| parent | 8d8c0dd183053c70516499e764039216c14147f8 (diff) | |
* rubyio.h (rb_io_t): renamed from OpenFile.
* ruby.h (struct RHash), file.c, gc.c, io.c, ext/dl/dl.c,
ext/io/wait/wait.c, ext/pty/pty.c, ext/readline/readline.c,
ext/socket/socket.c: ditto.
* win32/win32.h: removed workaround for OpenFile.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/win32/win32.h b/win32/win32.h index 744c712009..abac2b1e3d 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -19,9 +19,7 @@ // // #include <stdarg.h> conflict with varargs.h? -// There is function-name conflitct, so we rename it #if !defined(IN) && !defined(FLOAT) -#define OpenFile WINAPI_OpenFile #ifdef __BORLANDC__ #define USE_WINSOCK2 #endif @@ -32,7 +30,6 @@ #include <windows.h> #include <winsock.h> #endif -#undef OpenFile #endif #define NT 1 /* deprecated */ |