akr	2013-04-07 11:00:46 +0900 (Sun, 07 Apr 2013)

  New Revision: 40172

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40172

  Log:
    * 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).

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/include/ruby/defines.h

Index: include/ruby/defines.h
===================================================================
--- include/ruby/defines.h	(revision 40171)
+++ include/ruby/defines.h	(revision 40172)
@@ -57,6 +57,10 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/include/ruby/defines.h#L57
 # 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*); https://github.com/ruby/ruby/blob/trunk/include/ruby/defines.h#L197
 
 #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__
Index: configure.in
===================================================================
--- configure.in	(revision 40171)
+++ configure.in	(revision 40172)
@@ -2439,8 +2439,7 @@ if test "$with_dln_a_out" != yes; then https://github.com/ruby/ruby/blob/trunk/configure.in#L2439
 			    DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
                             ],
 			  [i586*], [
-			    : ${LDSHARED='$(LD) -shared'}
-			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lroot"
+			    : ${LDSHARED='$(CC) -shared'}
 			    ])
 			: ${LIBPATHENV=LIBRARY_PATH}
 			rb_cv_dlopen=yes ],
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40171)
+++ ChangeLog	(revision 40172)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Apr  7 10:44:01 2013  Tanaka Akira  <akr@f...>
+
+	* 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).
+
 Sun Apr  7 10:41:30 2013  Tanaka Akira  <akr@f...>
 
 	* lib/resolv.rb (MDNSOneShot#sender): Delete an unused variable.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/