summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-28 01:23:49 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-28 01:23:49 +0000
commit61b3acd568e057074dea5007a8eb6dfa55b1cbc4 (patch)
tree22f00fa2c26364c86d115078eef4002683d30b8f
parent4ccc50f436d6de11fef2f610bc988b31ec060a60 (diff)
* win32/{Makeilfe.sub,win32.c} (FILE_COUNT, FILE_READPTR): move the
definitions from config.h to win32.c. I dared to have left such macros, for other future compiler support. [ruby-core:41313] [Bug #5674] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--win32/Makefile.sub2
-rw-r--r--win32/win32.c4
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b1c18d9..74605f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 28 10:20:58 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/{Makeilfe.sub,win32.c} (FILE_COUNT, FILE_READPTR): move the
+ definitions from config.h to win32.c. I dared to have left such
+ macros, for other future compiler support.
+ [ruby-core:41313] [Bug #5674]
+
Mon Nov 28 09:28:30 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_uchmod): typo. [Bug#5671] [ruby-dev:44898]
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 2441b8d..a6e764d 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -637,8 +637,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define HAVE_DAYLIGHT 1
#define SETPGRP_VOID 1
#define RSHIFT(x,y) ((x)>>(int)y)
-#define FILE_COUNT _cnt
-#define FILE_READPTR _ptr
#define HAVE_RB_FD_INIT 1
#define RUBY_SETJMP(env) _setjmp(env)
#define RUBY_LONGJMP(env,val) longjmp(env,val)
diff --git a/win32/win32.c b/win32/win32.c
index 5619c75..bf8ddc3 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4886,6 +4886,10 @@ read(int fd, void *buf, size_t size)
}
#endif
+
+#define FILE_COUNT _cnt
+#define FILE_READPTR _ptr
+
#undef fgetc
/* License: Ruby's */
int