From 0618ea7590eac584b6cb16fed1d36133b6e8986c Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 19 Dec 2014 11:00:22 +0000 Subject: [PATCH] ruby.h: get rid of C++ warnings * include/ruby/ruby.h (PRIsVALUE): put a space after string literals not to be confused with C++11 string literal suffix. https://github.com/ruby/ruby/commit/a9f3eb7#commitcomment-9040169 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ include/ruby/ruby.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f132b5af2e..617adde24b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 19 20:00:19 2014 Nobuyoshi Nakada + + * include/ruby/ruby.h (PRIsVALUE): put a space after string + literals not to be confused with C++11 string literal suffix. + https://github.com/ruby/ruby/commit/a9f3eb7#commitcomment-9040169 + Fri Dec 19 15:36:02 2014 Simon Genier * hash.c (hash_equal): prefer true than the result of implicit diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 6f0003746a..79093949a0 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -130,14 +130,14 @@ typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1]; #define PRIuVALUE PRIuPTR #define PRIxVALUE PRIxPTR #define PRIXVALUE PRIXPTR -#define PRIsVALUE PRIiPTR""RUBY_PRI_VALUE_MARK +#define PRIsVALUE PRIiPTR"" RUBY_PRI_VALUE_MARK #else #define PRIdVALUE PRI_VALUE_PREFIX"d" #define PRIoVALUE PRI_VALUE_PREFIX"o" #define PRIuVALUE PRI_VALUE_PREFIX"u" #define PRIxVALUE PRI_VALUE_PREFIX"x" #define PRIXVALUE PRI_VALUE_PREFIX"X" -#define PRIsVALUE PRI_VALUE_PREFIX"i"RUBY_PRI_VALUE_MARK +#define PRIsVALUE PRI_VALUE_PREFIX"i" RUBY_PRI_VALUE_MARK #endif #ifndef PRI_VALUE_PREFIX # define PRI_VALUE_PREFIX ""