* configure.in (ac_cv_sizeof_rlim_t): setup for DJGPP.

* io.c (is_socket, shutdown): define dummy macros for DJGPP.

* process.c: use SIZEOF_RLIM_T instead of HAVE_RLIM_T for DJGPP.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c0b1d6c60..ae2f7d190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Dec  6 23:00:45 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (ac_cv_sizeof_rlim_t): setup for DJGPP.
+
+	* io.c (is_socket, shutdown): define dummy macros for DJGPP.
+
+	* process.c: use SIZEOF_RLIM_T instead of HAVE_RLIM_T for DJGPP.
+
 Mon Dec  6 21:19:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* io.c (is_socket): fix typos. [ruby-core:03900]
diff --git a/configure.in b/configure.in
index ac76c4bcf..95172d3f2 100644
--- a/configure.in
+++ b/configure.in
@@ -318,6 +318,7 @@ os2-emx*)	LIBS="-lm $LIBS"
 msdosdjgpp*)	LIBS="-lm $LIBS"
 		ac_cv_func_getpgrp_void=yes
 		ac_cv_func_setitimer=no
+		ac_cv_sizeof_rlim_t=4
 		ac_cv_func_fork=no
 		;;
 freebsd*)	LIBS="-lm $LIBS"
diff --git a/io.c b/io.c
index 4bb3e368c..1a721ef94 100644
--- a/io.c
+++ b/io.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 
 #include <sys/types.h>
-#if !defined(_WIN32)
+#if !defined(_WIN32) && !defined(__DJGPP__)
 # if defined(__BEOS__)
 #  include <net/socket.h>
 # else
@@ -139,6 +139,9 @@ static VALUE lineno = INT2FIX(0);
 
 #if defined(_WIN32)
 #define is_socket(fd, path)	rb_w32_is_socket(fd)
+#elif defined(__DJGPP__)
+#define is_socket(fd, path)	0
+#define shutdown(a,b)	0
 #else
 static int
 is_socket(fd, path)
diff --git a/process.c b/process.c
index ca37d8729..c3b964752 100644
--- a/process.c
+++ b/process.c
@@ -1941,7 +1941,7 @@ proc_setpriority(obj, which, who, prio)
 #endif
 }
 
-#ifdef HAVE_RLIM_T
+#if SIZEOF_RLIM_T
 #if SIZEOF_RLIM_T == SIZEOF_INT
 # define RLIM2NUM(v) UINT2NUM(v)
 # define NUM2RLIM(v) NUM2UINT(v)