aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--vm_core.h4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2fc06487c3..2858fca612 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 21 13:50:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_core.h (UNINITIALIZED_VAR): suppress warnings by clang 4.2.
+ [ruby-core:51742] [Bug #7756]
+
Thu Mar 21 07:34:00 2013 Zachary Scott <zachary@zacharyscott.net>
* ext/date/date_core.c: Typo in Date::MONTHNAMES by Matt Gauger
diff --git a/vm_core.h b/vm_core.h
index 5cce489e21..576ba8e0d9 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -115,7 +115,9 @@
#define UNLIKELY(x) (x)
#endif /* __GNUC__ >= 3 */
-#if __GNUC__ >= 3
+#if (defined(__clang__) && (__clang_major__ == 4 && __clang_minor__ == 2))
+#define UNINITIALIZED_VAR(x) x __attribute__((unused))
+#elif defined(__GNUC__) && __GNUC__ >= 3
#define UNINITIALIZED_VAR(x) x = x
#else
#define UNINITIALIZED_VAR(x) x