nobu	2008-10-26 18:07:37 +0900 (Sun, 26 Oct 2008)

  New Revision: 19946

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19946

  Log:
    * ext/etc/etc.c (sGroup): getgrent may not be available.

  Modified files:
    trunk/ChangeLog
    trunk/ext/etc/etc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19945)
+++ ChangeLog	(revision 19946)
@@ -1,4 +1,4 @@
-Sun Oct 26 18:01:06 2008  Nobuyoshi Nakada  <nobu@r...>
+Sun Oct 26 18:07:20 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (blocking_region_{begin,end}): declared as inline.
 
@@ -6,6 +6,8 @@
 
 	* win32/win32.c (rb_w32_pipe): serial is DWORD.
 
+	* ext/etc/etc.c (sGroup): getgrent may not be available.
+
 Sun Oct 26 13:30:28 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (read_all): use the given buffer to read when needs readconv.
Index: ext/etc/etc.c
===================================================================
--- ext/etc/etc.c	(revision 19945)
+++ ext/etc/etc.c	(revision 19946)
@@ -26,7 +26,10 @@
 #define uid_t int
 #endif
 
-static VALUE sPasswd, sGroup;
+static VALUE sPasswd;
+#ifdef HAVE_GETGRENT
+static VALUE sGroup;
+#endif
 
 #ifndef _WIN32
 char *getenv();
@@ -132,7 +135,7 @@
 	uid = getuid();
     }
     pwd = getpwuid(uid);
-    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", uid);
+    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", (int)uid);
     return setup_passwd(pwd);
 #else 
     return Qnil;
@@ -333,7 +336,7 @@
 	gid = getgid();
     }
     grp = getgrgid(gid);
-    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
+    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", (int)gid);
     return setup_group(grp);
 #else
     return Qnil;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/