mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	*** empty log message ***
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									3a90c86316
								
							
						
					
					
						commit
						959077c8e0
					
				
					 2 changed files with 2 additions and 6 deletions
				
			
		
							
								
								
									
										6
									
								
								eval.c
									
										
									
									
									
								
							
							
						
						
									
										6
									
								
								eval.c
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -6682,7 +6682,7 @@ search_required(fname, featurep, path)
 | 
			
		|||
    char *ext, *ftptr;
 | 
			
		||||
    int type;
 | 
			
		||||
 | 
			
		||||
    *featurep = fname;
 | 
			
		||||
    *featurep = fname = rb_str_new4(fname);
 | 
			
		||||
    *path = 0;
 | 
			
		||||
    ext = strrchr(ftptr = RSTRING(fname)->ptr, '.');
 | 
			
		||||
    if (ext && !strchr(ext, '/')) {
 | 
			
		||||
| 
						 | 
				
			
			@ -6786,10 +6786,6 @@ rb_require_safe(fname, safe)
 | 
			
		|||
		    /* partial state */
 | 
			
		||||
		    ftptr = ruby_strdup(RSTRING(feature)->ptr);
 | 
			
		||||
		    st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
 | 
			
		||||
		    if (feature == fname && !OBJ_FROZEN(feature)) {
 | 
			
		||||
			feature = rb_str_dup(feature);
 | 
			
		||||
			OBJ_FREEZE(feature);
 | 
			
		||||
		    }
 | 
			
		||||
		    rb_load(path, 0);
 | 
			
		||||
		    break;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue