Add patches for ruby source tree
This commit is contained in:
		
							parent
							
								
									30507d2f6f
								
							
						
					
					
						commit
						d8aa5f2b0d
					
				
					 2 changed files with 40 additions and 0 deletions
				
			
		
							
								
								
									
										15
									
								
								patches/ruby/marshal_utf8.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								patches/ruby/marshal_utf8.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,15 @@
 | 
				
			||||||
 | 
					diff --git a/marshal.c b/marshal.c
 | 
				
			||||||
 | 
					index 4cba05d..dfce6ee 100644
 | 
				
			||||||
 | 
					--- a/marshal.c
 | 
				
			||||||
 | 
					+++ b/marshal.c
 | 
				
			||||||
 | 
					@@ -1312,7 +1312,9 @@ r_unique(struct load_arg *arg)
 | 
				
			||||||
 | 
					 static VALUE
 | 
				
			||||||
 | 
					 r_string(struct load_arg *arg)
 | 
				
			||||||
 | 
					 {
 | 
				
			||||||
 | 
					-    return r_bytes(arg);
 | 
				
			||||||
 | 
					+    VALUE str = r_bytes(arg);
 | 
				
			||||||
 | 
					+    rb_enc_associate(str, rb_utf8_encoding());
 | 
				
			||||||
 | 
					+    return str;
 | 
				
			||||||
 | 
					 }
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 static VALUE
 | 
				
			||||||
							
								
								
									
										25
									
								
								patches/ruby/unused_param.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								patches/ruby/unused_param.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,25 @@
 | 
				
			||||||
 | 
					diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
 | 
				
			||||||
 | 
					index 0a8407a..22dff42 100644
 | 
				
			||||||
 | 
					--- a/include/ruby/ruby.h
 | 
				
			||||||
 | 
					+++ b/include/ruby/ruby.h
 | 
				
			||||||
 | 
					@@ -1207,6 +1207,9 @@ rb_obj_wb_unprotect(VALUE x, const char *filename, int line)
 | 
				
			||||||
 | 
					     RGENGC_LOGGING_WB_UNPROTECT((void *)x, filename, line);
 | 
				
			||||||
 | 
					 #endif
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					+	(void) filename;
 | 
				
			||||||
 | 
					+	(void) line;
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					 #if USE_RGENGC
 | 
				
			||||||
 | 
					     /* `x' should be an RVALUE object */
 | 
				
			||||||
 | 
					     if (FL_TEST_RAW((x), FL_WB_PROTECTED)) {
 | 
				
			||||||
 | 
					@@ -1227,6 +1230,10 @@ rb_obj_written(VALUE a, VALUE oldv, VALUE b, const char *filename, int line)
 | 
				
			||||||
 | 
					     RGENGC_LOGGING_OBJ_WRITTEN(a, oldv, b, filename, line);
 | 
				
			||||||
 | 
					 #endif
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					+	(void) oldv;
 | 
				
			||||||
 | 
					+	(void) filename;
 | 
				
			||||||
 | 
					+	(void) line;
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					 #if USE_RGENGC
 | 
				
			||||||
 | 
					     /* `a' should be an RVALUE object */
 | 
				
			||||||
 | 
					     if (FL_TEST_RAW((a), FL_OLDGEN) &&
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue