kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* include/ruby/defines.h: Simplify the logic to include sys/select.h.

Browse source 
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
This commit is contained in:
akr 2013-04-07 02:00:46 +00:00
parent 672490d08c
commit 1f32d09523
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun Apr 7 10:44:01 2013 Tanaka Akira <akr@fsij.org>
* 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@fsij.org>
* lib/resolv.rb (MDNSOneShot#sender): Delete an unused variable.

3
configure.in
View file

@ -2439,8 +2439,7 @@ if test "$with_dln_a_out" != yes; then
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 ],

6
include/ruby/defines.h
View file

@ -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__