From: Katsuyuki Komatsu <komatsu@...>
Date: 2000-02-25T23:09:42+09:00
Subject: [ruby-dev:9288] [PATCH] mswin32: ruby.h, win32/ruby.def for Ruby 1.5.2

小松です。

Ruby 1.5.2では、rb_safe_level()がマクロになったので、
mswin32でruby_safe_levelをデータとしてエクスポートするため、
ruby.hのexternをEXTERNに変更する必要があります。

ついでに、ひさびさにwin32/ruby.defのメンテナンスです。

あとは、DJGPP用のconfig_s.dj, top.sedのRuby 1.4系からの取り込み
もれです。

Fri Feb 25 23:01:49 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>

	* ruby.h: export ruby_safe_level by EXTERN for mswin32.
	* win32/ruby.def: regular maintenance.

diff -ru2p ruby-1.5.2.dist/config_s.dj ruby-1.5.2/config_s.dj
--- ruby-1.5.2.dist/config_s.dj	Fri Aug 13 14:45:02 1999
+++ ruby-1.5.2/config_s.dj	Fri Feb 25 23:01:49 2000
@@ -33,5 +33,5 @@ s%@INSTALL_PROGRAM@%${INSTALL}%g
 s%@INSTALL_DATA@%${INSTALL} -m 644%g
 s%@SET_MAKE@%%g
-s%@LIBOBJS@% crypt.o flock.o fnmatch.o snprintf.o%g
+s%@LIBOBJS@% crypt.o flock.o snprintf.o%g
 s%@ALLOCA@%%g
 s%@DEFAULT_KCODE@%%g
diff -ru2p ruby-1.5.2.dist/ruby.h ruby-1.5.2/ruby.h
--- ruby-1.5.2.dist/ruby.h	Thu Feb 17 16:11:17 2000
+++ ruby-1.5.2/ruby.h	Fri Feb 25 23:01:49 2000
@@ -180,5 +180,5 @@ void rb_check_safe_str _((VALUE));
 void rb_secure _((int));
 
-extern int ruby_safe_level;
+EXTERN int ruby_safe_level;
 #define rb_safe_level() (ruby_safe_level)
 void rb_set_safe_level _((int));
diff -ru2p ruby-1.5.2.dist/top.sed ruby-1.5.2/top.sed
--- ruby-1.5.2.dist/top.sed	Fri Aug 13 14:45:15 1999
+++ ruby-1.5.2/top.sed	Fri Feb 25 23:01:49 2000
@@ -34,5 +34,5 @@ s%@INSTALL_PROGRAM@%${INSTALL}%g
 s%@INSTALL_DATA@%${INSTALL} -m 644%g
 s%@SET_MAKE@%%g
-s%@LIBOBJS@% crypt.o flock.o fnmatch.o vsnprintf.o%g
+s%@LIBOBJS@% crypt.o flock.o vsnprintf.o%g
 s%@ALLOCA@%%g
 s%@DEFAULT_KCODE@%%g
diff -ru2p ruby-1.5.2.dist/win32/ruby.def ruby-1.5.2/win32/ruby.def
--- ruby-1.5.2.dist/win32/ruby.def	Thu Nov  4 17:39:39 1999
+++ ruby-1.5.2/win32/ruby.def	Fri Feb 25 23:01:49 2000
@@ -35,4 +35,5 @@ EXPORTS
 ;eval.c
 	rb_cProc
+	ruby_safe_level
 	ruby_frame
 	rb_cThread
@@ -134,4 +135,5 @@ EXPORTS
 	mygetservbyport
 	myget_osfhandle
+	win32_getcwd
 	win32_getenv
 ;array.c
@@ -173,4 +175,5 @@ EXPORTS
 	rb_uint2inum
 	rb_int2inum
+	rb_cstr2inum
 	rb_str2inum
 	rb_big2str
@@ -225,5 +228,4 @@ EXPORTS
 ;enum.c
 	rb_each
-	rb_enum_length
 ;error.c
 	rb_compile_error
@@ -251,8 +253,7 @@ EXPORTS
 	rb_attr
 	rb_dvar_defined
+	rb_dvar_curr
 	rb_dvar_ref
 	rb_dvar_push
-	rb_dvar_asgn
-	rb_safe_level
 	rb_set_safe_level
 	rb_check_safe_str
@@ -324,6 +325,10 @@ EXPORTS
 	eaccess
 	rb_file_s_expand_path
+	rb_file_const
+	rb_find_file
+	rb_path_check
 ;gc.c
 	xmalloc
+	xfree
 	xcalloc
 	xrealloc
@@ -357,4 +362,5 @@ EXPORTS
 	rb_io_check_readable
 	rb_io_check_writable
+	rb_read_pending
 	rb_read_check
 	rb_io_write
@@ -373,5 +379,5 @@ EXPORTS
 	rb_file_open
 	rb_file_sysopen
-	rb_io_synchronized	
+	rb_io_synchronized
 	rb_p
 	rb_gets
@@ -433,5 +439,7 @@ EXPORTS
 ;re.c
 	rb_str_cicmp
+	rb_reg_mbclen2
 	rb_match_busy
+	rb_reg_adjust_startpos
 	rb_reg_search
 	rb_reg_nth_defined
@@ -519,8 +527,8 @@ EXPORTS
 	rb_type
 	rb_special_const_p
-	rb_test_false_or_nil
 	ruby_scan_oct
 	ruby_scan_hex
 	ruby_mktemp
+	ruby_add_suffix
 	ruby_qsort
 ;variable.c
@@ -543,5 +551,6 @@ EXPORTS
 	rb_gvar_get
 	rb_gvar_set
-	rb_gvar_set2
+	rb_gv_set
+	rb_gv_get
 	rb_gvar_defined
 	rb_f_global_variables

--
小松克行 / Katsuyuki Komatsu <komatsu@sarion.co.jp>