From 77f5c7399603de8bdc36069cb89a9874ffdf62bc Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 15 Aug 2007 19:21:08 +0000 Subject: git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ process.c | 11 +++++++++-- version.h | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b77a6299e..e9dd78d871 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Aug 16 04:14:17 2007 Nobuyoshi Nakada + + * process.c (ruby_setreuid, ruby_setregid): rename to get rid of name + clash. Thu Aug 16 04:11:17 2007 Ryan Davis * lib/rexml/dtd/dtd.rb: Fixed typo in code. Fixes bug #10420 diff --git a/process.c b/process.c index d964c35a42..6064cd1142 100644 --- a/process.c +++ b/process.c @@ -101,6 +101,13 @@ static VALUE S_Tms; #define BROKEN_SETREGID 1 #endif +#ifdef BROKEN_SETREUID +#define setreuid ruby_setreuid +#endif +#ifdef BROKEN_SETREGID +#define setregid ruby_setregid +#endif + #if defined(HAVE_44BSD_SETUID) || defined(__MacOS_X__) #if !defined(USE_SETREUID) && !defined(BROKEN_SETREUID) #define OBSOLETE_SETREUID 1 @@ -3667,8 +3674,8 @@ Init_process() rb_define_module_function(rb_mProcGID, "change_privilege", p_gid_change_privilege, 1); rb_define_module_function(rb_mProcUID, "grant_privilege", p_uid_grant_privilege, 1); rb_define_module_function(rb_mProcGID, "grant_privilege", p_gid_grant_privilege, 1); - rb_define_alias(rb_mProcUID, "eid=", "grant_privilege"); - rb_define_alias(rb_mProcGID, "eid=", "grant_privilege"); + rb_define_alias(rb_singleton_class(rb_mProcUID), "eid=", "grant_privilege"); + rb_define_alias(rb_singleton_class(rb_mProcGID), "eid=", "grant_privilege"); rb_define_module_function(rb_mProcUID, "re_exchange", p_uid_exchange, 0); rb_define_module_function(rb_mProcGID, "re_exchange", p_gid_exchange, 0); rb_define_module_function(rb_mProcUID, "re_exchangeable?", p_uid_exchangeable, 0); diff --git a/version.h b/version.h index e33fb6e28b..2bcd5cb163 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-16" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 56 +#define RUBY_PATCHLEVEL 57 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3