From e585523a2b60a69befc1562fd4c79cfa688bb197 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 12 Dec 2005 00:36:54 +0000
Subject: * ext/digest/digest.c (rb_digest_base_s_digest): add volatile to  
 protect temporary context object.  [ruby-dev:27979]

* ext/iconv/iconv.c (Init_iconv): rb_gc_register_address() should
  be called before actual variable initialization.
  [ruby-dev:27986]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/etc/etc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ext/etc/etc.c')

diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 94196e066a..ac95735549 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -521,6 +521,7 @@ Init_etc()
     rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
     rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
 
+    rb_global_variable(&sPasswd);
     sPasswd =  rb_struct_define("Passwd",
 				"name", "passwd", "uid", "gid",
 #ifdef HAVE_ST_PW_GECOS
@@ -546,14 +547,13 @@ Init_etc()
 				"expire",
 #endif
 				NULL);
-    rb_global_variable(&sPasswd);
 
 #ifdef HAVE_GETGRENT
+    rb_global_variable(&sGroup);
     sGroup = rb_struct_define("Group", "name",
 #ifdef HAVE_ST_GR_PASSWD
 			      "passwd",
 #endif
 			      "gid", "mem", NULL);
-    rb_global_variable(&sGroup);
 #endif
 }
-- 
cgit v1.2.3