aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gc.c10
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b13e05a148..ed41fc2d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Aug 10 08:41:28 2012 Eric Hodel <drbrain@segment7.net>
+
+ * gc.c (gc_malloc_allocated_size): RDoc does not process macros, so
+ mention this method is only available when ruby is built with
+ CALC_EXACT_MALLOC_SIZE
+ * gc.c (gc_malloc_allocations): ditto
+
Thu Aug 9 23:46:51 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/mkrunnable.rb: see build_os instead of target arch for
diff --git a/gc.c b/gc.c
index c1460796dd..34d942298d 100644
--- a/gc.c
+++ b/gc.c
@@ -3471,9 +3471,8 @@ ruby_mimmalloc(size_t size)
* call-seq:
* GC.malloc_allocated_size -> Integer
*
- * The allocated size by malloc().
- *
- * It returns the allocated size by malloc().
+ * Returns the size of memory allocated by malloc(). Only available if ruby
+ * was built with CALC_EXACT_MALLOC_SIZE.
*/
static VALUE
@@ -3486,9 +3485,8 @@ gc_malloc_allocated_size(VALUE self)
* call-seq:
* GC.malloc_allocations -> Integer
*
- * The number of allocated memory object by malloc().
- *
- * It returns the number of allocated memory object by malloc().
+ * Returns the number of malloc() allocations. Only available if ruby was
+ * built with CALC_EXACT_MALLOC_SIZE.
*/
static VALUE