aboutsummaryrefslogtreecommitdiffstats
path: root/include/ruby/defines.h
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-07 02:00:46 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-07 02:00:46 +0000
commit1f32d09523be89556b5e0d06f431b852b992a177 (patch)
tree98dc3b6302799986b914a15919daf0f3cb3eacc8 /include/ruby/defines.h
parent672490d08cd7b67d05f6834844f79f890abf21f9 (diff)
downloadruby-1f32d09523be89556b5e0d06f431b852b992a177.tar.gz
* include/ruby/defines.h: Simplify the logic to include sys/select.h.
This fixes a compilation error on Haiku (gcc2 and gcc4). * configure.in: Use shared linker as $(CC) for Haiku. This fixes a build error on Haiku (gcc2). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby/defines.h')
-rw-r--r--include/ruby/defines.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 93b9025014..f6fe2c9832 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -57,6 +57,10 @@ extern "C" {
# include <unistd.h>
#endif
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+
#define RUBY
#ifdef __cplusplus
@@ -193,8 +197,6 @@ void xfree(void*);
#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
#include <net/socket.h> /* intern.h needs fd_set definition */
-#elif defined (__SYMBIAN32__) && defined (HAVE_SYS_SELECT_H)
-# include <sys/select.h>
#endif
#ifdef __SYMBIAN32__