* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name

	  clash.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@13136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 14 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index d363f4d8a..3b7b8bb74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug 22 08:32:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
+	  clash.
 Wed Aug 22 08:27:53 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (ResponseParser#next_token): fixed
diff --git a/process.c b/process.c
index 14efe58d0..87fed73c5 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
@@ -3670,8 +3677,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 35fbe5cd9..882e5a1fc 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 42
+#define RUBY_PATCHLEVEL 43
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8