diff --git a/ChangeLog b/ChangeLog
index 33471eab93..6b027ca7ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 24 11:19:58 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (time_new_internal): add prototype to tell the compiler
+	  arugments types.
+
+	* win32/win32.c (NtInitialize): need to set a handler for VC++8.
+
 Fri Feb 24 08:19:16 2006  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* test.rb: Removed.  Obsolete by test/nkf.
diff --git a/time.c b/time.c
index 9492efafb3..fa337989d7 100644
--- a/time.c
+++ b/time.c
@@ -139,6 +139,7 @@ time_overflow_p(secp, usecp)
     *usecp = usec;
 }
 
+static VALUE time_new_internal _((VALUE, time_t, time_t));
 static VALUE
 time_new_internal(klass, sec, usec)
     VALUE klass;
diff --git a/win32/win32.c b/win32/win32.c
index 5bc1f5b245..f51e93e30a 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -354,6 +354,13 @@ flock(int fd, int oper)
 			      (DWORD)-1);
 }
 
+#if _MSC_VER >= 1400
+static void invalid_parameter(const wchar_t *expr, const wchar_t *func, const wchar_t *file, unsigned int line, uintptr_t dummy)
+{
+    // nothing to do
+}
+#endif
+
 //
 // Initialization stuff
 //
@@ -364,6 +371,10 @@ NtInitialize(int *argc, char ***argv)
     WORD version;
     int ret;
 
+#if _MSC_VER >= 1400
+    _set_invalid_parameter_handler(invalid_parameter);
+#endif
+
     //
     // subvert cmd.exe's feeble attempt at command line parsing
     //