summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-11 02:58:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-11 02:58:26 +0000
commit021e7b7f20718a31906ef2728fab73d18e42013a (patch)
treeb7181507b741717871595342d8a945f6caaf8c85
parent1edc8d3b9ecb23fb22f929ba19b0f9bc94edceb2 (diff)
* include/ruby/win32.h (ftruncate): rename to get rid of conflict
with same name but non-LFS function on MinGW. [ruby-core:24757] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/win32.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ad2fd5e2a..7e158f6440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 11 11:58:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/win32.h (ftruncate): rename to get rid of conflict
+ with same name but non-LFS function on MinGW. [ruby-core:24757]
+
Sun Apr 11 10:33:34 2010 Eric Hodel <drbrain@segment7.net>
* lib/rdoc: Update to RDoc 2.5.3. Includes r27288 and r27290.
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index cd7353580f..8ea3f3b1c4 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -359,6 +359,7 @@ scalb(double a, long b)
//
#define SUFFIX
+#define ftruncate rb_w32_ftruncate
extern int truncate(const char *path, off_t length);
extern int ftruncate(int fd, off_t length);
extern int fseeko(FILE *stream, off_t offset, int whence);