nobu	2013-08-31 00:25:26 +0900 (Sat, 31 Aug 2013)

  New Revision: 42734

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

  Log:
    encoding.h: fix conflicts
    
    * include/ruby/encoding.h (rb_{ascii8bit,utf8,usascii}_encindex): get
      rid of conflict with macros defined in internal.h.

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/encoding.h
Index: include/ruby/encoding.h
===================================================================
--- include/ruby/encoding.h	(revision 42733)
+++ include/ruby/encoding.h	(revision 42734)
@@ -197,9 +197,15 @@ rb_encoding *rb_locale_encoding(void); https://github.com/ruby/ruby/blob/trunk/include/ruby/encoding.h#L197
 rb_encoding *rb_filesystem_encoding(void);
 rb_encoding *rb_default_external_encoding(void);
 rb_encoding *rb_default_internal_encoding(void);
+#ifndef rb_ascii8bit_encindex
 int rb_ascii8bit_encindex(void);
+#endif
+#ifndef rb_utf8_encindex
 int rb_utf8_encindex(void);
+#endif
+#ifndef rb_usascii_encindex
 int rb_usascii_encindex(void);
+#endif
 int rb_locale_encindex(void);
 int rb_filesystem_encindex(void);
 VALUE rb_enc_default_external(void);
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 42733)
+++ ChangeLog	(revision 42734)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Aug 31 00:25:15 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/encoding.h (rb_{ascii8bit,utf8,usascii}_encindex): get
+	  rid of conflict with macros defined in internal.h.
+
 Fri Aug 30 22:37:57 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread_pthread.c (native_thread_init_stack): wait the creator thread

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