summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-25 16:38:49 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-25 16:38:49 +0000
commit14dfb46b5f3b8f6c076701303400003baf7ed394 (patch)
treef0cd357eb1ca8f7100dbd5de041da3a74f9128b3
parent59d945ef21304918b85942713a59c1d3ffccbd16 (diff)
* include/ruby/ruby.h: check defined(USE_RGENGC_LOGGING_WB_UNPROTECT)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--include/ruby/ruby.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e61df241e23..6422417fc62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 26 01:37:45 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * include/ruby/ruby.h: check defined(USE_RGENGC_LOGGING_WB_UNPROTECT)
+
Fri Jul 26 01:21:41 2013 NARUSE, Yui <naruse@ruby-lang.org>
* file.c (rb_file_expand_path_internal): fix r42160; skip '~'.
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 7bfc0b261c8..575a2b61fce 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1266,7 +1266,7 @@ void rb_gc_writebarrier_unprotect_promoted(VALUE obj);
#define OBJ_WRITE(a, slot, b) rb_obj_write((VALUE)(a), (VALUE *)(slot), (VALUE)(b), __FILE__, __LINE__)
#define OBJ_WRITTEN(a, oldv, b) rb_obj_written((VALUE)(a), (VALUE)(oldv), (VALUE)(b), __FILE__, __LINE__)
-#if USE_RGENGC_LOGGING_WB_UNPROTECT
+#if defined(USE_RGENGC_LOGGING_WB_UNPROTECT) && USE_RGENGC_LOGGING_WB_UNPROTECT
void rb_gc_unprotect_logging(void *objptr, const char *filename, int line);
#define RGENGC_LOGGING_WB_UNPROTECT rb_gc_unprotect_logging
#endif