Revision

1259

Author

pthomson@apple.com

Date

2009-03-29 20:02:03 -0700 (Sun, 29 Mar 2009)

Log Message

Removed some unused #includes from io.c. The specs and test_roxor still work correctly.

Modified Paths

• MacRuby/branches/experimental/include/ruby/io.h
• MacRuby/branches/experimental/io.c

Diff

--- MacRuby/branches/experimental/include/ruby/io.h	2009-03-29 23:33:34 UTC (rev 1258)
+++ MacRuby/branches/experimental/include/ruby/io.h	2009-03-30 03:02:03 UTC (rev 1259)
@@ -59,17 +59,18 @@
 #define FMODE_WSPLIT_INITIALIZED  0x400
 #define FMODE_TRUNC                 0x00000800
 #define FMODE_TEXTMODE              0x00001000
+#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE)
 
-
 #ifndef SEEK_CUR
 # define SEEK_SET 0
 # define SEEK_CUR 1
 # define SEEK_END 2
 #endif
 
-#define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE)
+#ifndef O_ACCMODE
+#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
+#endif
 
-
 VALUE rb_io_taint_check(VALUE);
 NORETURN(void rb_eof_error(void));
 

--- MacRuby/branches/experimental/io.c	2009-03-29 23:33:34 UTC (rev 1258)
+++ MacRuby/branches/experimental/io.c	2009-03-30 03:02:03 UTC (rev 1259)
@@ -11,39 +11,23 @@
 
 #include "ruby/ruby.h"
 #include "ruby/io.h"
-#include "ruby/signal.h"
+#include "ruby/util.h"
 #include "ruby/node.h"
 #include "roxor.h"
-#include <ctype.h>
-#include <errno.h>
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
+#include <errno.h>
 #include <paths.h>
 #include <fcntl.h>
+#include <unistd.h>
 
+#include <sys/select.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
-
 #include <sys/param.h>
-
-#if !defined NOFILE
-# define NOFILE 64
-#endif
-
-#include <unistd.h>
 #include <sys/syscall.h>
 
 extern void Init_File(void);
 
-#include "ruby/util.h"
-
-#ifndef O_ACCMODE
-#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
-#endif
-
 #if SIZEOF_OFF_T > SIZEOF_LONG && !defined(HAVE_LONG_LONG)
 # error off_t is bigger than long, but you have no long long...
 #endif
@@ -1883,7 +1867,7 @@
 static VALUE
 rb_io_sysseek(VALUE io, SEL sel, int argc, VALUE *argv)
 {
-rb_notimplement();
+rb_notimplement(); 
 }
 
 /*