summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-12 01:39:39 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-12 01:39:39 +0000
commitc3b81f63e76fee3c09e5881eff7c2d2d60d00bab (patch)
tree9730f447fc49921c6e5801c3f9a1838c806674e5
parentace092cb7a160141ee6df169aa52e88deb941e3b (diff)
* include/ruby/win32.h: VC doesn't have ftruncate() and others, but
ruby needs HAVE_ macros to use our emulation functions. (fix the problem of 31262) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--include/ruby/win32.h6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fc2fe6a95b..dc53386cc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr 12 10:37:39 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/win32.h: VC doesn't have ftruncate() and others, but
+ ruby needs HAVE_ macros to use our emulation functions.
+ (fix the problem of 31262)
+
Tue Apr 12 01:33:00 2011 Luis Lavena <luislavena@gmail.com>
* configure.in: properly evaluate existence of truncate, ftruncate
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index d822a016dc..f9dadb222e 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -382,19 +382,19 @@ scalb(double a, long b)
#define SUFFIX
-#if !defined HAVE_FTRUNCATE
+#if !defined HAVE_FTRUNCATE || defined(_MSC_VER)
#define ftruncate rb_w32_ftruncate
extern int rb_w32_ftruncate(int fd, off_t length);
#endif
-#if !defined HAVE_TRUNCATE
+#if !defined HAVE_TRUNCATE || defined(_MSC_VER)
#define truncate rb_w32_truncate
extern int rb_w32_truncate(const char *path, off_t length);
#endif
extern int fseeko(FILE *stream, off_t offset, int whence);
-#if !defined HAVE_FTELLO
+#if !defined HAVE_FTELLO || defined(_MSC_VER)
#define ftello rb_w32_ftello
extern off_t rb_w32_ftello(FILE *stream);
#endif