summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-09 18:05:20 +0000
committerwyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-09 18:05:20 +0000
commit71abe58ac36d75f685b8fed1969e2fa25f6d7f55 (patch)
tree353849975a43b3915332e830856e33a4375c70b8
parentbc50de4bd586e8ca7475c1d2e0172569e44e4f86 (diff)
Fixed warning: passing argument 1 of 'add_freelist' makes pointer from integer without a cast
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@24005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--gc.c2
-rw-r--r--version.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 590d921929..3c87f6a3df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Thu Jul 9 11:22:00 2009 Kirk Haines <khaines@ruby-lang.org>
* gc.c: Add a check for DATA_PTR(obj) to run_final as a stopgap fix for debilitating segfaults.
+ * gc.c: Fixes warning: passing argument 1 of 'add_freelist' makes pointer from integer without a cast
+
Mon Jun 8 12:46:00 2009 Kirk Haines <khaines@ruby-lang.org>
* lib/soap/mimemessage.rb: Fixed a typo -- conent -> content
diff --git a/gc.c b/gc.c
index 1ed3a38ff4..9ea6f302c5 100644
--- a/gc.c
+++ b/gc.c
@@ -1193,7 +1193,7 @@ void
rb_gc_force_recycle(p)
VALUE p;
{
- add_freelist(p);
+ add_freelist((RVALUE*)p);
}
static inline void
diff --git a/version.h b/version.h
index 39d28ce683..7dd3da3543 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-06-08"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090608
-#define RUBY_PATCHLEVEL 370
+#define RUBY_PATCHLEVEL 371
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8