diff --git a/ChangeLog b/ChangeLog
index b2655e17b5..c4ce83c06a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 22 23:22:53 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* missing/vsnprintf.c (errno): [BUG] fixes a compilation 
+	  error on SIZEOF_LONG > SIZEOF_INT.
+	  (BSD_vfprintf): ditto.
+
 Fri May 22 23:20:48 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* spec/default.mspec: follows runruby.rb's move at r23542.
diff --git a/missing/vsnprintf.c b/missing/vsnprintf.c
index 840346c325..5718362fed 100644
--- a/missing/vsnprintf.c
+++ b/missing/vsnprintf.c
@@ -123,6 +123,10 @@
 #define	NULL	0
 #endif
 
+#if SIZEOF_LONG > SIZEOF_INT
+# include <errno.h>
+#endif
+
 /*
  * NB: to fit things in six character monocase externals, the stdio
  * code uses the prefix `__s' for stdio objects, typically followed
@@ -598,7 +602,7 @@ BSD_vfprintf(FILE *fp, const char *fmt0, va_list ap)
 #if SIZEOF_LONG > SIZEOF_INT
 	/* abandon if too larger padding */
 #define PAD_L(howmany, with) { \
-	ln = (howmany);
+	ln = (howmany); \
 	if ((long)((int)ln) != ln) { \
 	    errno = ENOMEM; \
 	    goto error; \