diff --git a/ChangeLog b/ChangeLog
index fc85df3e6d..f5f60406e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ Fri Oct 21 15:23:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	  (but I believe this won't cause actual bug in current implementation)
 	  [ruby-dev:27055]
 
+	* time.c: should use LONG_LONG instead of `long long'.
+
 Thu Oct 20 22:22:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parser.y (struct parser_params): parser never modify input string.
diff --git a/time.c b/time.c
index e2dc06644d..a1980d07d0 100644
--- a/time.c
+++ b/time.c
@@ -1206,7 +1206,7 @@ typedef unsigned long unsigned_time_t;
 #elif SIZEOF_TIME_T == SIZEOF_INT
 typedef unsigned int unsigned_time_t;
 #elif SIZEOF_TIME_T == SIZEOF_LONG_LONG
-typedef unsigned long long unsigned_time_t;
+typedef unsigned LONG_LONG unsigned_time_t;
 #else
 # error cannot find integer type which size is same as time_t.
 #endif
@@ -1670,10 +1670,9 @@ time_to_a(VALUE time)
 
 #define SMALLBUF 100
 static int
-rb_strftime(
-    char ** volatile buf,
-    char * volatile format,
-    struct tm * volatile time)
+rb_strftime(char ** volatile buf,
+            char * volatile format,
+            struct tm * volatile time)
 {
     volatile int size;
     int len, flen;