* io.c (io_fwrite): avoid context switch before writing to stderr.

  [ruby-dev:25080]

* rubyio.h: refine deprecated declaration.

* configure.in, file.c, io.c: remove useless check: fseeko, etc.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7490 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 22 deletions

diff --git a/rubyio.h b/rubyio.h
index 52ce3790b6..7ef021b72f 100644
--- a/rubyio.h
+++ b/rubyio.h
@@ -99,29 +99,18 @@ NORETURN(void rb_eof_error _((void)));
 void rb_io_read_check _((OpenFile*));
 int rb_io_read_pending _((OpenFile*));
 
-int rb_getc _((FILE*))
 #ifdef __GNUC__
-  __attribute__ ((deprecated))
+# if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+#  define DEPRECATED(x) x __attribute__ ((deprecated))
+# endif
 #endif
-  ;
-long rb_io_fread _((char *, long, FILE *))
-#ifdef __GNUC__
-  __attribute__ ((deprecated))
-#endif
-  ;
-long rb_io_fwrite _((const char *, long, FILE *))
-#ifdef __GNUC__
-  __attribute__ ((deprecated))
-#endif
-  ;
-void rb_read_check _((FILE*))
-#ifdef __GNUC__
-  __attribute__ ((deprecated))
-#endif
-  ;
-int rb_read_pending _((FILE*))
-#ifdef __GNUC__
-  __attribute__ ((deprecated))
+#ifndef DEPRECATED
+# define DEPRECATED(x) x
 #endif
-  ;
+
+DEPRECATED(int rb_getc _((FILE*)));
+DEPRECATED(long rb_io_fread _((char *, long, FILE *)));
+DEPRECATED(long rb_io_fwrite _((const char *, long, FILE *)));
+DEPRECATED(void rb_read_check _((FILE*)));
+DEPRECATED(int rb_read_pending _((FILE*)));
 #endif