[前][次][番号順一覧][スレッド一覧]

ruby-changes:16714

From: nobu <ko1@a...>
Date: Thu, 22 Jul 2010 12:03:02 +0900 (JST)
Subject: [ruby-changes:16714] Ruby:r28710 (trunk): * include/ruby/{intern,io}.h: add missing prototypes.

nobu	2010-07-22 12:02:40 +0900 (Thu, 22 Jul 2010)

  New Revision: 28710

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

  Log:
    * include/ruby/{intern,io}.h: add missing prototypes.

  Modified files:
    trunk/ChangeLog
    trunk/complex.c
    trunk/ext/dl/cfunc.c
    trunk/ext/zlib/zlib.c
    trunk/include/ruby/intern.h
    trunk/include/ruby/io.h
    trunk/pack.c
    trunk/rational.c
    trunk/vm_core.h

Index: complex.c
===================================================================
--- complex.c	(revision 28709)
+++ complex.c	(revision 28710)
@@ -359,12 +359,20 @@
 #ifdef CANON
 static int canonicalization = 0;
 
+#if defined __GNUC__ && __GNUC__ >= 4
+#pragma GCC visibility push(default)
+#endif
+
 void
 nucomp_canonicalization(int f)
 {
     canonicalization = f;
 }
+
+#if defined __GNUC__ && __GNUC__ >= 4
+#pragma GCC visibility pop
 #endif
+#endif
 
 inline static void
 nucomp_real_check(VALUE num)
Index: include/ruby/intern.h
===================================================================
--- include/ruby/intern.h	(revision 28709)
+++ include/ruby/intern.h	(revision 28710)
@@ -54,6 +54,7 @@
 VALUE rb_ary_subseq(VALUE, long, long);
 void rb_ary_store(VALUE, long, VALUE);
 VALUE rb_ary_dup(VALUE);
+VALUE rb_ary_resurrect(VALUE ary);
 VALUE rb_ary_to_ary(VALUE);
 VALUE rb_ary_to_s(VALUE);
 VALUE rb_ary_push(VALUE, VALUE);
@@ -99,6 +100,7 @@
 #define rb_big2int(x) rb_big2long(x)
 VALUE rb_big2ulong(VALUE);
 #define rb_big2uint(x) rb_big2ulong(x)
+VALUE rb_big2ulong_pack(VALUE x);
 #if HAVE_LONG_LONG
 VALUE rb_ll2inum(LONG_LONG);
 VALUE rb_ull2inum(unsigned LONG_LONG);
@@ -635,6 +637,7 @@
 VALUE rb_obj_as_string(VALUE);
 VALUE rb_check_string_type(VALUE);
 VALUE rb_str_dup(VALUE);
+VALUE rb_str_resurrect(VALUE str);
 VALUE rb_str_locktmp(VALUE);
 VALUE rb_str_unlocktmp(VALUE);
 VALUE rb_str_dup_frozen(VALUE);
Index: include/ruby/io.h
===================================================================
--- include/ruby/io.h	(revision 28709)
+++ include/ruby/io.h	(revision 28710)
@@ -157,6 +157,7 @@
 int rb_io_wait_readable(int);
 int rb_io_wait_writable(int);
 void rb_io_set_nonblock(rb_io_t *fptr);
+int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p, int *fmode_p);
 
 /* compatibility for ruby 1.8 and older */
 #define rb_io_mode_flags(modestr) rb_io_modestr_fmode(modestr)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28709)
+++ ChangeLog	(revision 28710)
@@ -1,3 +1,7 @@
+Thu Jul 22 12:02:31 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/{intern,io}.h: add missing prototypes.
+
 Thu Jul 22 06:38:18 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (XCFLAGS): use -fvisibility=hidden if possible.
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 28709)
+++ vm_core.h	(revision 28710)
@@ -645,9 +645,6 @@
 
 #define sysstack_error GET_VM()->special_exceptions[ruby_error_sysstack]
 
-VALUE rb_str_resurrect(VALUE str);
-VALUE rb_ary_resurrect(VALUE ary);
-
 /* for thread */
 
 #if RUBY_VM_THREAD_MODEL == 2
Index: pack.c
===================================================================
--- pack.c	(revision 28709)
+++ pack.c	(revision 28710)
@@ -267,8 +267,6 @@
 # define VTOHD(x,y)	rb_vtohd(x)
 #endif
 
-VALUE rb_big2ulong_pack(VALUE x);
-
 static unsigned long
 num2i32(VALUE x)
 {
Index: ext/dl/cfunc.c
===================================================================
--- ext/dl/cfunc.c	(revision 28709)
+++ ext/dl/cfunc.c	(revision 28710)
@@ -6,8 +6,6 @@
 #include <errno.h>
 #include "dl.h"
 
-VALUE rb_big2ulong_pack(VALUE x);
-
 VALUE rb_cDLCFunc;
 
 static ID id_last_error;
Index: ext/zlib/zlib.c
===================================================================
--- ext/zlib/zlib.c	(revision 28709)
+++ ext/zlib/zlib.c	(revision 28710)
@@ -9,7 +9,7 @@
 #include <ruby.h>
 #include <zlib.h>
 #include <time.h>
-#include <ruby/encoding.h>
+#include <ruby/io.h>
 
 #ifdef HAVE_VALGRIND_MEMCHECK_H
 # include <valgrind/memcheck.h>
@@ -209,9 +209,6 @@
 
 void Init_zlib(void);
 
-int rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p);
-VALUE rb_str_conv_enc_opts(VALUE, rb_encoding*, rb_encoding*, int, VALUE);
-
 /*--------- Exceptions --------*/
 
 static VALUE cZError, cStreamEnd, cNeedDict;
@@ -2794,7 +2791,7 @@
 rb_gzfile_ecopts(struct gzfile *gz, VALUE opts)
 {
     if (!NIL_P(opts)) {
-	rb_io_extract_encoding_option(opts, &gz->enc, &gz->enc2);
+	rb_io_extract_encoding_option(opts, &gz->enc, &gz->enc2, NULL);
     }
     if (gz->enc2) {
 	gz->ecflags = rb_econv_prepare_opts(opts, &opts);
Index: rational.c
===================================================================
--- rational.c	(revision 28709)
+++ rational.c	(revision 28710)
@@ -403,12 +403,20 @@
 #ifdef CANON
 static int canonicalization = 0;
 
+#if defined __GNUC__ && __GNUC__ >= 4
+#pragma GCC visibility push(default)
+#endif
+
 void
 nurat_canonicalization(int f)
 {
     canonicalization = f;
 }
+
+#if defined __GNUC__ && __GNUC__ >= 4
+#pragma GCC visibility pop
 #endif
+#endif
 
 inline static void
 nurat_int_check(VALUE num)

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

[前][次][番号順一覧][スレッド一覧]