summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--numeric.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d9a4403ce..979352b4ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 23 18:03:31 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * numeric.c (rb_infinity, rb_nan): aggregated member initializers
+ need braces.
+
Sun Oct 23 16:43:43 2011 Naohisa Goto <ngotogenome@gmail.com>
* ext/io/wait/wait.c: ioctl(2) is declared in unistd.h on Solaris.
diff --git a/numeric.c b/numeric.c
index 17ddb84459..e59226c48a 100644
--- a/numeric.c
+++ b/numeric.c
@@ -66,16 +66,16 @@
#ifdef HAVE_INFINITY
#elif !defined(WORDS_BIGENDIAN) /* BYTE_ORDER == LITTLE_ENDIAN */
-const union bytesequence4_or_float rb_infinity = { 0x00, 0x00, 0x80, 0x7f };
+const union bytesequence4_or_float rb_infinity = {{0x00, 0x00, 0x80, 0x7f}};
#else
-const union bytesequence4_or_float rb_infinity = { 0x7f, 0x80, 0x00, 0x00 };
+const union bytesequence4_or_float rb_infinity = {{0x7f, 0x80, 0x00, 0x00}};
#endif
#ifdef HAVE_NAN
#elif !defined(WORDS_BIGENDIAN) /* BYTE_ORDER == LITTLE_ENDIAN */
-const union bytesequence4_or_float rb_nan = { 0x00, 0x00, 0xc0, 0x7f };
+const union bytesequence4_or_float rb_nan = {{0x00, 0x00, 0xc0, 0x7f}};
#else
-const union bytesequence4_or_float rb_nan = { 0x7f, 0xc0, 0x00, 0x00 };
+const union bytesequence4_or_float rb_nan = {{0x7f, 0xc0, 0x00, 0x00}};
#endif
#ifndef HAVE_ROUND