summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-17 05:53:05 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-17 05:53:05 +0000
commitfc495126160d33a1f6ded09c586a8f4c44ceebe9 (patch)
tree0e6d92a7d1ea1a67fe239a7cd54c28468b76c0d9
parente6b21dd101d08dc6d4dd56665729017cd41f882b (diff)
downloadruby-fc495126160d33a1f6ded09c586a8f4c44ceebe9.tar.gz
ruby-fc495126160d33a1f6ded09c586a8f4c44ceebe9.tar.xz
ruby-fc495126160d33a1f6ded09c586a8f4c44ceebe9.zip
* ext/socket/mkconstants.rb: don't cause an error for duplicate names.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/mkconstants.rb6
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cb3451546..a32a76260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 17 14:52:27 2009 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/mkconstants.rb: don't cause an error for duplicate names.
+
Sat Jan 17 12:46:17 2009 Tanaka Akira <akr@fsij.org>
* ext/socket: split files for each class.
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index eca7fe6b8..ec2519d30 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -38,7 +38,10 @@ h = {}
DATA.each_line {|s|
name, default_value = s.scan(/\S+/)
next unless name && name[0] != ?#
- raise "duplicate name: #{name}" if h.has_key? name
+ if h.has_key? name
+ warn "#{$.}: warning: duplicate name: #{name}"
+ next
+ end
h[name] = default_value
}
DEFS = h.to_a
@@ -465,6 +468,7 @@ SO_ATTACH_FILTER
SO_DETACH_FILTER
SO_PEERNAME
SO_TIMESTAMP
+SO_BINTIME
SOPRI_INTERACTIVE
SOPRI_NORMAL