summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/zlib/zlib.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 44a84b8017..72b827a337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 31 11:15:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/zlib/zlib.c (sizeof): zlib.h mistakenly assumes the result
+ of sizeof to be int, not size_t.
+
Fri Dec 31 10:27:34 2010 Tanaka Akira <akr@fsij.org>
* st.c: parenthesize macro arguments.
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index c59d0cbb27..deb25c1e22 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -42,6 +42,7 @@
#endif
#endif
+#define sizeof(x) ((int)sizeof(x))
/*--------- Prototypes --------*/