diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-01-16 09:22:45 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-01-16 09:22:45 +0000 |
| commit | ab1a751ece53402ad1903cae700a3f023b20803c (patch) | |
| tree | dd5ba61e658bb75e0fbe6b476ae67599e0e1f34e /ext | |
| parent | ce71ad15c71e4ec0fdc8d6249c6b3b0e6729e232 (diff) | |
* eval.c (block_pass): should not pass tainted block, if $SAFE > 0.
* variable.c (rb_mod_remove_cvar): should pass the char*.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/digest/defs.h | 3 | ||||
| -rw-r--r-- | ext/tcltklib/extconf.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ext/digest/defs.h b/ext/digest/defs.h index 7af8f52324..df7df377b9 100644 --- a/ext/digest/defs.h +++ b/ext/digest/defs.h @@ -10,7 +10,8 @@ #if defined(HAVE_SYS_CDEFS_H) # include <sys/cdefs.h> -#else +#endif +#if !defined(__BEGIN_DECLS) # define __BEGIN_DECLS # define __END_DECLS #endif diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb index f732c165dc..fd98b1e7da 100644 --- a/ext/tcltklib/extconf.rb +++ b/ext/tcltklib/extconf.rb @@ -18,7 +18,7 @@ tcllib = with_config("tcllib") stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs") def find_tcl(tcllib, stubs) - paths = ["/usr/local/lib", "/usr/pkg", "/usr/lib"] + paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] func = stubs ? "Tcl_InitStubs" : "Tcl_FindExecutable" if tcllib find_library(tcllib, func, *paths) @@ -40,7 +40,7 @@ def find_tcl(tcllib, stubs) end def find_tk(tklib, stubs) - paths = ["/usr/local/lib", "/usr/pkg", "/usr/lib"] + paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] func = stubs ? "Tk_InitStubs" : "Tk_Init" if tklib find_library(tklib, func, *paths) |