aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcharliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-01 14:45:27 +0000
committercharliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-01 14:45:27 +0000
commitd60c6c8642e0e6193e5d513135b5dfaaf8a58cfd (patch)
tree79acaf1a18b6e408b3371ee27ad5ce4d9a6f1a5b
parentec2db8decf97b79aef557c4b81eef3a0479f4ae3 (diff)
downloadruby-d60c6c8642e0e6193e5d513135b5dfaaf8a58cfd.tar.gz
* vm_core.h: use __attribute__((unused)) in UNINTIALIZED_VAR on clang
4.0+ instead of just on 4.2. Clang has supported the unused attribute since before version 4, so this should be safe. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--vm_core.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4bd1be90d2..cf32934e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct 1 23:44:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
+
+ * vm_core.h: use __attribute__((unused)) in UNINTIALIZED_VAR on clang
+ 4.0+ instead of just on 4.2. Clang has supported the unused attribute
+ since before version 4, so this should be safe.
+
Tue Oct 1 22:03:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/tempfile.rb (Tempfile#unlink): finalizer is no longer needed
diff --git a/vm_core.h b/vm_core.h
index 4e46479940..8ebd390532 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -109,7 +109,7 @@
#define UNLIKELY(x) (x)
#endif /* __GNUC__ >= 3 */
-#if (defined(__clang__) && (__clang_major__ == 4 && __clang_minor__ == 2))
+#if (defined(__clang__) && __clang_major__ >= 4)
#define UNINITIALIZED_VAR(x) x __attribute__((unused))
#elif defined(__GNUC__) && __GNUC__ >= 3
#define UNINITIALIZED_VAR(x) x = x