diff --git a/ChangeLog b/ChangeLog
index ec7a5cafc2..7370fcc806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Apr 22 10:38:47 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c (glob_helper): C99(gcc)-ism.
+
+	* time.c (find_time_t): GUESS macro needs the variable named ``result''
+	  always.
+
 Wed Apr 22 09:27:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* time.c (localtime_with_gmtoff): fixed cross function jump.
diff --git a/dir.c b/dir.c
index 0b293e3dd1..7ded65420b 100644
--- a/dir.c
+++ b/dir.c
@@ -1267,8 +1267,9 @@ glob_helper(
 
     if (magical || recursive) {
 	struct dirent *dp;
+	DIR *dirp;
 	IF_HAVE_READDIR_R(struct dirent entry);
-	DIR *dirp = do_opendir(*path ? path : ".", flags);
+	dirp = do_opendir(*path ? path : ".", flags);
 	if (dirp == NULL) return 0;
 
 	while (READDIR(dirp, enc, &entry, dp)) {
diff --git a/time.c b/time.c
index 9d0f10ab7f..a0e06148c7 100644
--- a/time.c
+++ b/time.c
@@ -1534,7 +1534,7 @@ find_time_t(struct tm *tptr, int utc_p, time_t *tp)
     struct tm *tm, tm_lo, tm_hi;
     int d, have_guess;
     int find_dst;
-    IF_HAVE_GMTIME_R(struct tm result);
+    struct tm result;
 #define GUESS(p) (utc_p ? gmtime_with_leapsecond(p, &result) : LOCALTIME(p, result))
 
     find_dst = 0 < tptr->tm_isdst;