From f813ed043e9b7fe80ccb9e39c482f5974ea61e60 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 27 May 2010 14:52:53 +0000
Subject: merge revision(s) 28037: 	* include/ruby/encoding.h
 (rb_filesystem_encindex): defined. 	* include/ruby/encoding.h
 (rb_locale_encindex): ditto. 	* encoding.c (rb_filesystem_encindex): remove
 static. 	* encoding.c (rb_locale_encindex): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 encoding.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'encoding.c')

diff --git a/encoding.c b/encoding.c
index b1aceffa18..001762221f 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1114,7 +1114,7 @@ rb_usascii_encindex(void)
     return ENCINDEX_US_ASCII;
 }
 
-static int
+int
 rb_locale_encindex(void)
 {
     VALUE charmap = rb_locale_charmap(rb_cEncoding);
@@ -1155,7 +1155,7 @@ enc_set_filesystem_encoding(void)
     return idx;
 }
 
-static int
+int
 rb_filesystem_encindex(void)
 {
     int idx = rb_enc_registered("filesystem");
-- 
cgit v1.2.3