summaryrefslogtreecommitdiffstats
path: root/include/ruby
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-06 20:52:44 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-06 20:52:44 +0000
commit04fb0a3fed441108a389e36918a42742dc1b866c (patch)
treea87024f988f543cb81a6076a3987ccd32c934019 /include/ruby
parenta4ac4058ecc0affbdfdef7273f930143395c4f53 (diff)
downloadruby-04fb0a3fed441108a389e36918a42742dc1b866c.tar.gz
ruby-04fb0a3fed441108a389e36918a42742dc1b866c.tar.xz
ruby-04fb0a3fed441108a389e36918a42742dc1b866c.zip
* eval_intern.h: Add support to Haiku. see [ruby-core:18110]
* include/ruby/defines.h: ditto. * configure.in: ditto. * thread_pthread.c: ditto. * io.c: ditto. * lib/mkmf.rb: ditto. * ext/socket/getaddrinfo.c: ditto. * ext/socket/extconf.rb: ditto. * ext/socket/socket.c: ditto. * ext/socket/addrinfo.h: ditto. * ext/socket/getnameinfo.c: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
-rw-r--r--include/ruby/defines.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 2be89de5f..411b91235 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -198,7 +198,7 @@ void xfree(void*);
#include "vms/vms.h"
#endif
-#if defined(__BEOS__)
+#if defined(__BEOS__) && !defined(__HAIKU__)
#include <net/socket.h> /* intern.h needs fd_set definition */
#endif