19991124-1.4.3pre1

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 16 insertions, 7 deletions

diff --git a/error.c b/error.c
index 0e8fd6aa3b..feb3778d54 100644
--- a/error.c
+++ b/error.c
@@ -26,8 +26,11 @@
 int sys_nerr = 256;
 #endif
 
-#if defined __CYGWIN__ && defined _sys_nerr
-#define sys_nerr _sys_nerr
+#if defined __CYGWIN__
+# include <cygwin/version.h>
+# if (CYGWIN_VERSION_API_MAJOR > 0) || (CYGWIN_VERSION_API_MINOR >= 8)
+#  define sys_nerr _sys_nerr
+# endif
 #endif
 
 int ruby_nerrs;
@@ -38,14 +41,20 @@ err_snprintf(buf, len, fmt, args)
     int len;
     va_list args;
 {
+    int n;
+
     if (!ruby_sourcefile) {
 	vsnprintf(buf, len, fmt, args);
+	return;
+    }
+    else if (ruby_sourceline == 0) {
+	n = snprintf(buf, len, "%s: ", ruby_sourcefile);
     }
     else {
-	int n = snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
-	if (len > n) {
-	    vsnprintf((char*)buf+n, len-n, fmt, args);
-	}
+	n = snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
+    }
+    if (len > n) {
+	vsnprintf((char*)buf+n, len-n, fmt, args);
     }
 }
 
@@ -436,7 +445,7 @@ static const syserr_index_entry syserr_index[]= {
 static VALUE *syserr_list;
 #endif
 
-#ifndef NT
+#if !defined NT && !defined sys_nerr
 extern int sys_nerr;
 #endif