matz	2008-09-19 09:33:19 +0900 (Fri, 19 Sep 2008)

  New Revision: 19426

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

  Log:
    * dln.c: newer BeOS support.  a patch from Pete Goodeve
      <pete.goodeve at computer.org> in [ruby-core:18712].

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/dln.c
    trunk/ext/socket/getaddrinfo.c
    trunk/ext/socket/getnameinfo.c
    trunk/ext/socket/socket.c
    trunk/include/ruby/defines.h
    trunk/numeric.c

Index: include/ruby/defines.h
===================================================================
--- include/ruby/defines.h	(revision 19425)
+++ include/ruby/defines.h	(revision 19426)
@@ -198,7 +198,7 @@
 #include "vms/vms.h"
 #endif
 
-#if defined(__BEOS__) && !defined(__HAIKU__)
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
 #include <net/socket.h> /* intern.h needs fd_set definition */
 #endif
 
Index: configure.in
===================================================================
--- configure.in	(revision 19425)
+++ configure.in	(revision 19426)
@@ -1423,10 +1423,12 @@
 			  powerpc*)
 			    : ${LDSHARED="ld -xms"}
 			    DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
-                            ;;
+			    LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
+			    ;;
 			  i586*)
 			    : ${LDSHARED="ld -shared"}
-			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
+			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lbe -lroot"
+			    LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lbe -lroot"
 			    ;;
 			esac
 			: ${LIBPATHENV=LIBRARY_PATH}
@@ -1826,6 +1828,7 @@
 	    CFLAGS="$CFLAGS -relax_pointers"
 	    ;;
 	esac
+	CPPFLAGS="$CPPFLAGS -I/boot/home/config/include"
 	;;
     cygwin*|mingw*)
 	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19425)
+++ ChangeLog	(revision 19426)
@@ -1,3 +1,8 @@
+Fri Sep 19 09:29:26 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* dln.c: newer BeOS support.  a patch from Pete Goodeve
+	  <pete.goodeve at computer.org> in [ruby-core:18712].
+
 Fri Sep 19 03:41:25 2008  NARUSE, Yui  <naruse@r...>
 
 	* ext/nkf/nkf-utf8/nkf.c: fix memory violation. mentioned by mame [ruby-dev:36373]
Index: dln.c
===================================================================
--- dln.c	(revision 19425)
+++ dln.c	(revision 19426)
@@ -1442,7 +1442,8 @@
       /* load extention module */
       img_id = load_add_on(file);
       if (img_id <= 0) {
-	rb_loaderror("Failed to load %.200s", file);
+	rb_loaderror("Failed to load add_on %.200s error_code=%x",
+	  file, img_id);
       }
       
       /* find symbol for module initialize function. */
Index: ext/socket/getaddrinfo.c
===================================================================
--- ext/socket/getaddrinfo.c	(revision 19425)
+++ ext/socket/getaddrinfo.c	(revision 19426)
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/param.h>
-#if defined(__BEOS__) && !defined(__HAIKU__) 
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE) 
 # include <net/socket.h>
 #else
 # include <sys/socket.h>
Index: ext/socket/socket.c
===================================================================
--- ext/socket/socket.c	(revision 19425)
+++ ext/socket/socket.c	(revision 19426)
@@ -28,7 +28,7 @@
 #endif
 
 #ifndef _WIN32
-#if defined(__BEOS__) && !defined(__HAIKU__)  
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
 # include <net/socket.h>
 #else
 # include <sys/socket.h>
Index: ext/socket/getnameinfo.c
===================================================================
--- ext/socket/getnameinfo.c	(revision 19425)
+++ ext/socket/getnameinfo.c	(revision 19426)
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #ifndef _WIN32
-#if defined(__BEOS__) && !defined(__HAIKU__)  
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
 # include <net/socket.h>
 #else
 # include <sys/socket.h>
Index: numeric.c
===================================================================
--- numeric.c	(revision 19425)
+++ numeric.c	(revision 19426)
@@ -78,6 +78,9 @@
     }
     return x;
 }
+#elif defined(__BEOS__)
+/* appears to be a bug in the BeOS headers */
+double round(double x);
 #endif
 
 static ID id_coerce, id_to_i, id_eq;

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