summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-09-03 05:18:02 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-09-03 05:18:02 +0000
commitbcf2f6f3604ffd0cff4d17f8ee7c8718321421d7 (patch)
tree212245f33aa0e5ec2f0606ad615e00b2b37849b9
parenta927bfa5e062003201d5ebdda033148f35b62426 (diff)
downloadruby-bcf2f6f3604ffd0cff4d17f8ee7c8718321421d7.tar.gz
ruby-bcf2f6f3604ffd0cff4d17f8ee7c8718321421d7.tar.xz
ruby-bcf2f6f3604ffd0cff4d17f8ee7c8718321421d7.zip
* error.c: unbreak the build on *BSD with gcc 3.0.1 by removing
the conflicting declaration of sys_nerr for *BSD. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--error.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 425071002..0fbf85f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 3 14:11:17 2001 Akinori MUSHA <knu@iDaemons.org>
+
+ * error.c: unbreak the build on *BSD with gcc 3.0.1 by removing
+ the conflicting declaration of sys_nerr for *BSD.
+
Sat Sep 1 09:50:54 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* ruby.c (set_arg0): prevent SEGV when val is longer than the
diff --git a/error.c b/error.c
index f988f387c..544c8c798 100644
--- a/error.c
+++ b/error.c
@@ -506,7 +506,7 @@ static const syserr_index_entry syserr_index[]= {
static VALUE *syserr_list;
#endif
-#if !defined NT && !defined sys_nerr
+#if !defined(NT) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(sys_nerr)
extern int sys_nerr;
#endif