From a052d961034d72fcccaa92ba356c9d43f3154502 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Sat, 19 Oct 2024 20:44:33 +0200
Subject: [ruby/json] Compile with std=c99

https://github.com/ruby/json/commit/d4968d2e48
---
 ext/json/generator/extconf.rb  | 1 +
 ext/json/generator/generator.c | 2 +-
 ext/json/parser/extconf.rb     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'ext')

diff --git a/ext/json/generator/extconf.rb b/ext/json/generator/extconf.rb
index cf8d5f2bda..078068cf63 100644
--- a/ext/json/generator/extconf.rb
+++ b/ext/json/generator/extconf.rb
@@ -4,6 +4,7 @@ if RUBY_ENGINE == 'truffleruby'
   # The pure-Ruby generator is faster on TruffleRuby, so skip compiling the generator extension
   File.write('Makefile', dummy_makefile("").join)
 else
+  append_cflags("-std=c99")
   $defs << "-DJSON_GENERATOR"
   create_makefile 'json/ext/generator'
 end
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 05dc492926..cb05453244 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -257,7 +257,7 @@ static void convert_UTF8_to_ASCII_only_JSON(FBuffer *out_buffer, VALUE str, cons
                     }
 
                     for (short i = 1; i < ch_len; i++) {
-                        wchar = (wchar<<6) | (ptr[pos+i] & 0x3F);
+                        wchar = (wchar << 6) | (ptr[pos+i] & 0x3F);
                     }
 
                     FLUSH_POS(ch_len);
diff --git a/ext/json/parser/extconf.rb b/ext/json/parser/extconf.rb
index feb586e1b4..92419b787c 100644
--- a/ext/json/parser/extconf.rb
+++ b/ext/json/parser/extconf.rb
@@ -29,4 +29,6 @@ rescue NoMethodError
   $CFLAGS << ' -DSTR_UMINUS_DEDUPE_FROZEN=0 '
 end
 
+append_cflags("-std=c99")
+
 create_makefile 'json/ext/parser'
-- 
cgit v1.2.3