mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	merge revision(s) 32289:
* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@32320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									488fcde070
								
							
						
					
					
						commit
						64a12d32d8
					
				
					 3 changed files with 11 additions and 4 deletions
				
			
		|  | @ -1,3 +1,7 @@ | |||
| Thu Jun 30 12:52:56 2011  WATANABE Hirofumi  <eban@ruby-lang.org> | ||||
| 
 | ||||
| 	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw. | ||||
| 
 | ||||
| Sun Jun 26 17:52:32 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org> | ||||
| 
 | ||||
|         * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed. | ||||
|  |  | |||
|  | @ -2017,6 +2017,9 @@ if (TkLib_Config["tcltk-framework"] || | |||
|   $INSTALLFILES ||= [] | ||||
|   $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"] | ||||
| 
 | ||||
|   # remove harmful definitions. | ||||
|   $defs.delete_if{|x|/^-Du?intptr_t=/ =~ x} | ||||
| 
 | ||||
|   # create | ||||
|   $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"] | ||||
|   $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"] | ||||
|  |  | |||
|  | @ -1,15 +1,15 @@ | |||
| #define RUBY_VERSION "1.8.7" | ||||
| #define RUBY_RELEASE_DATE "2011-06-26" | ||||
| #define RUBY_RELEASE_DATE "2011-06-30" | ||||
| #define RUBY_VERSION_CODE 187 | ||||
| #define RUBY_RELEASE_CODE 20110626 | ||||
| #define RUBY_PATCHLEVEL 351 | ||||
| #define RUBY_RELEASE_CODE 20110630 | ||||
| #define RUBY_PATCHLEVEL 352 | ||||
| 
 | ||||
| #define RUBY_VERSION_MAJOR 1 | ||||
| #define RUBY_VERSION_MINOR 8 | ||||
| #define RUBY_VERSION_TEENY 7 | ||||
| #define RUBY_RELEASE_YEAR 2011 | ||||
| #define RUBY_RELEASE_MONTH 6 | ||||
| #define RUBY_RELEASE_DAY 26 | ||||
| #define RUBY_RELEASE_DAY 30 | ||||
| 
 | ||||
| #ifdef RUBY_EXTERN | ||||
| RUBY_EXTERN const char ruby_version[]; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 shyouhei
						shyouhei