ruby.h: add prefix

* include/ruby/ruby.h: prefix RUBY or RB to global symbols to get
  rid of name conflicts with other headers.
* include/ruby/encoding.h, include/ruby/intern.h: ditto.

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

1 files changed, 111 insertions, 57 deletions

diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 5eaf468059..5ea2cda116 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -24,56 +24,89 @@ extern "C" {
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
-#define ENCODING_INLINE_MAX 127
-#define ENCODING_SHIFT (FL_USHIFT+10)
-#define ENCODING_MASK (((VALUE)ENCODING_INLINE_MAX)<<ENCODING_SHIFT) /* FL_USER10|FL_USER11|FL_USER12|FL_USER13|FL_USER14|FL_USER15|FL_USER16 */
-
-#define ENCODING_SET_INLINED(obj,i) do {\
-    RBASIC(obj)->flags &= ~ENCODING_MASK;\
-    RBASIC(obj)->flags |= (VALUE)(i) << ENCODING_SHIFT;\
+enum ruby_encoding_consts {
+    RUBY_ENCODING_INLINE_MAX = 127,
+    RUBY_ENCODING_SHIFT = (RUBY_FL_USHIFT+10),
+    RUBY_ENCODING_MASK = (RUBY_ENCODING_INLINE_MAX<<RUBY_ENCODING_SHIFT
+			  /* RUBY_FL_USER10..RUBY_FL_USER16 */),
+    RUBY_ENCODING_MAXNAMELEN = 42
+};
+
+#define ENCODING_INLINE_MAX RUBY_ENCODING_INLINE_MAX
+#define ENCODING_SHIFT RUBY_ENCODING_SHIFT
+#define ENCODING_MASK RUBY_ENCODING_MASK
+
+#define RB_ENCODING_SET_INLINED(obj,i) do {\
+    RBASIC(obj)->flags &= ~RUBY_ENCODING_MASK;\
+    RBASIC(obj)->flags |= (VALUE)(i) << RUBY_ENCODING_SHIFT;\
 } while (0)
-#define ENCODING_SET(obj,i) rb_enc_set_index((obj), (i))
+#define RB_ENCODING_SET(obj,i) rb_enc_set_index((obj), (i))
 
-#define ENCODING_GET_INLINED(obj) (int)((RBASIC(obj)->flags & ENCODING_MASK)>>ENCODING_SHIFT)
-#define ENCODING_GET(obj) \
-    (ENCODING_GET_INLINED(obj) != ENCODING_INLINE_MAX ? \
-     ENCODING_GET_INLINED(obj) : \
+#define RB_ENCODING_GET_INLINED(obj) \
+    (int)((RBASIC(obj)->flags & RUBY_ENCODING_MASK)>>RUBY_ENCODING_SHIFT)
+#define RB_ENCODING_GET(obj) \
+    (RB_ENCODING_GET_INLINED(obj) != RUBY_ENCODING_INLINE_MAX ? \
+     RB_ENCODING_GET_INLINED(obj) : \
      rb_enc_get_index(obj))
 
-#define ENCODING_IS_ASCII8BIT(obj) (ENCODING_GET_INLINED(obj) == 0)
-
-#define ENCODING_MAXNAMELEN 42
+#define RB_ENCODING_IS_ASCII8BIT(obj) (RB_ENCODING_GET_INLINED(obj) == 0)
+
+#define ENCODING_SET_INLINED(obj,i) RB_ENCODING_SET_INLINED(obj,i)
+#define ENCODING_SET(obj,i) RB_ENCODING_SET(obj,i)
+#define ENCODING_GET_INLINED(obj) RB_ENCODING_GET_INLINED(obj)
+#define ENCODING_GET(obj) RB_ENCODING_GET(obj)
+#define ENCODING_IS_ASCII8BIT(obj) RB_ENCODING_IS_ASCII8BIT(obj)
+#define ENCODING_MAXNAMELEN RUBY_ENCODING_MAXNAMELEN
+
+enum ruby_coderange_type {
+    RUBY_ENC_CODERANGE_UNKNOWN	= 0,
+    RUBY_ENC_CODERANGE_7BIT	= ((int)RUBY_FL_USER8),
+    RUBY_ENC_CODERANGE_VALID	= ((int)RUBY_FL_USER9),
+    RUBY_ENC_CODERANGE_BROKEN	= ((int)(RUBY_FL_USER8|RUBY_FL_USER9)),
+    RUBY_ENC_CODERANGE_MASK	= (RUBY_ENC_CODERANGE_7BIT|
+				   RUBY_ENC_CODERANGE_VALID|
+				   RUBY_ENC_CODERANGE_BROKEN)
+};
 
-#define ENC_CODERANGE_MASK	((int)(FL_USER8|FL_USER9))
-#define ENC_CODERANGE_UNKNOWN	0
-#define ENC_CODERANGE_7BIT	((int)FL_USER8)
-#define ENC_CODERANGE_VALID	((int)FL_USER9)
-#define ENC_CODERANGE_BROKEN	((int)(FL_USER8|FL_USER9))
 static inline int
 rb_enc_coderange_clean_p(int cr)
 {
-    return (cr ^ (cr >> 1)) & ENC_CODERANGE_7BIT;
+    return (cr ^ (cr >> 1)) & RUBY_ENC_CODERANGE_7BIT;
 }
-#define ENC_CODERANGE_CLEAN_P(cr) rb_enc_coderange_clean_p(cr)
-#define ENC_CODERANGE(obj) ((int)RBASIC(obj)->flags & ENC_CODERANGE_MASK)
-#define ENC_CODERANGE_ASCIIONLY(obj) (ENC_CODERANGE(obj) == ENC_CODERANGE_7BIT)
-#define ENC_CODERANGE_SET(obj,cr) (RBASIC(obj)->flags = \
-				   (RBASIC(obj)->flags & ~ENC_CODERANGE_MASK) | (cr))
-#define ENC_CODERANGE_CLEAR(obj) ENC_CODERANGE_SET((obj),0)
+#define RB_ENC_CODERANGE_CLEAN_P(cr) rb_enc_coderange_clean_p(cr)
+#define RB_ENC_CODERANGE(obj) ((int)RBASIC(obj)->flags & RUBY_ENC_CODERANGE_MASK)
+#define RB_ENC_CODERANGE_ASCIIONLY(obj) (RB_ENC_CODERANGE(obj) == RUBY_ENC_CODERANGE_7BIT)
+#define RB_ENC_CODERANGE_SET(obj,cr) (\
+	RBASIC(obj)->flags = \
+	(RBASIC(obj)->flags & ~RUBY_ENC_CODERANGE_MASK) | (cr))
+#define RB_ENC_CODERANGE_CLEAR(obj) RB_ENC_CODERANGE_SET((obj),0)
 
 /* assumed ASCII compatibility */
-#define ENC_CODERANGE_AND(a, b) \
-    ((a) == ENC_CODERANGE_7BIT ? (b) : \
-     (a) == ENC_CODERANGE_VALID ? ((b) == ENC_CODERANGE_7BIT ? ENC_CODERANGE_VALID : (b)) : \
-     ENC_CODERANGE_UNKNOWN)
+#define RB_ENC_CODERANGE_AND(a, b) \
+    ((a) == RUBY_ENC_CODERANGE_7BIT ? (b) : \
+     (a) != RUBY_ENC_CODERANGE_VALID ? RUBY_ENC_CODERANGE_UNKNOWN : \
+     (b) == RUBY_ENC_CODERANGE_7BIT ? RUBY_ENC_CODERANGE_VALID : (b))
 
-#define ENCODING_CODERANGE_SET(obj, encindex, cr) \
+#define RB_ENCODING_CODERANGE_SET(obj, encindex, cr) \
     do { \
         VALUE rb_encoding_coderange_obj = (obj); \
-        ENCODING_SET(rb_encoding_coderange_obj, (encindex)); \
-        ENC_CODERANGE_SET(rb_encoding_coderange_obj, (cr)); \
+        RB_ENCODING_SET(rb_encoding_coderange_obj, (encindex)); \
+        RB_ENC_CODERANGE_SET(rb_encoding_coderange_obj, (cr)); \
     } while (0)
 
+#define ENC_CODERANGE_MASK	RUBY_ENC_CODERANGE_MASK
+#define ENC_CODERANGE_UNKNOWN	RUBY_ENC_CODERANGE_UNKNOWN
+#define ENC_CODERANGE_7BIT	RUBY_ENC_CODERANGE_7BIT
+#define ENC_CODERANGE_VALID	RUBY_ENC_CODERANGE_VALID
+#define ENC_CODERANGE_BROKEN	RUBY_ENC_CODERANGE_BROKEN
+#define ENC_CODERANGE_CLEAN_P(cr)    RB_ENC_CODERANGE_CLEAN_P(cr)
+#define ENC_CODERANGE(obj)           RB_ENC_CODERANGE(obj)
+#define ENC_CODERANGE_ASCIIONLY(obj) RB_ENC_CODERANGE_ASCIIONLY(obj)
+#define ENC_CODERANGE_SET(obj,cr)    RB_ENC_CODERANGE_SET(obj,cr)
+#define ENC_CODERANGE_CLEAR(obj)     RB_ENC_CODERANGE_CLEAR(obj)
+#define ENC_CODERANGE_AND(a, b)      RB_ENC_CODERANGE_AND(a, b)
+#define ENCODING_CODERANGE_SET(obj, encindex, cr) RB_ENCODING_CODERANGE_SET(obj, encindex, cr)
+
 typedef const OnigEncodingType rb_encoding;
 
 int rb_char_to_option_kcode(int c, int *option, int *kcode);
@@ -315,43 +348,64 @@ VALUE rb_econv_append(rb_econv_t *ec, const char *bytesrc, long bytesize, VALUE
 
 void rb_econv_binmode(rb_econv_t *ec);
 
+enum ruby_econv_flag_type {
 /* flags for rb_econv_open */
+    RUBY_ECONV_ERROR_HANDLER_MASK               = 0x000000ff,
 
-#define ECONV_ERROR_HANDLER_MASK                0x000000ff
+    RUBY_ECONV_INVALID_MASK                     = 0x0000000f,
+    RUBY_ECONV_INVALID_REPLACE                  = 0x00000002,
 
-#define ECONV_INVALID_MASK                      0x0000000f
-#define ECONV_INVALID_REPLACE                   0x00000002
+    RUBY_ECONV_UNDEF_MASK                       = 0x000000f0,
+    RUBY_ECONV_UNDEF_REPLACE                    = 0x00000020,
+    RUBY_ECONV_UNDEF_HEX_CHARREF                = 0x00000030,
 
-#define ECONV_UNDEF_MASK                        0x000000f0
-#define ECONV_UNDEF_REPLACE                     0x00000020
-#define ECONV_UNDEF_HEX_CHARREF                 0x00000030
+    RUBY_ECONV_DECORATOR_MASK                   = 0x0000ff00,
+    RUBY_ECONV_NEWLINE_DECORATOR_MASK           = 0x00003f00,
+    RUBY_ECONV_NEWLINE_DECORATOR_READ_MASK      = 0x00000f00,
+    RUBY_ECONV_NEWLINE_DECORATOR_WRITE_MASK     = 0x00003000,
 
-#define ECONV_DECORATOR_MASK                    0x0000ff00
-#define ECONV_NEWLINE_DECORATOR_MASK            0x00003f00
-#define ECONV_NEWLINE_DECORATOR_READ_MASK       0x00000f00
-#define ECONV_NEWLINE_DECORATOR_WRITE_MASK      0x00003000
+    RUBY_ECONV_UNIVERSAL_NEWLINE_DECORATOR      = 0x00000100,
+    RUBY_ECONV_CRLF_NEWLINE_DECORATOR           = 0x00001000,
+    RUBY_ECONV_CR_NEWLINE_DECORATOR             = 0x00002000,
+    RUBY_ECONV_XML_TEXT_DECORATOR               = 0x00004000,
+    RUBY_ECONV_XML_ATTR_CONTENT_DECORATOR       = 0x00008000,
 
-#define ECONV_UNIVERSAL_NEWLINE_DECORATOR       0x00000100
-#define ECONV_CRLF_NEWLINE_DECORATOR            0x00001000
-#define ECONV_CR_NEWLINE_DECORATOR              0x00002000
-#define ECONV_XML_TEXT_DECORATOR                0x00004000
-#define ECONV_XML_ATTR_CONTENT_DECORATOR        0x00008000
-
-#define ECONV_STATEFUL_DECORATOR_MASK           0x00f00000
-#define ECONV_XML_ATTR_QUOTE_DECORATOR          0x00100000
+    RUBY_ECONV_STATEFUL_DECORATOR_MASK          = 0x00f00000,
+    RUBY_ECONV_XML_ATTR_QUOTE_DECORATOR         = 0x00100000,
 
+    RUBY_ECONV_DEFAULT_NEWLINE_DECORATOR        =
 #if defined(RUBY_TEST_CRLF_ENVIRONMENT) || defined(_WIN32)
-#define ECONV_DEFAULT_NEWLINE_DECORATOR ECONV_CRLF_NEWLINE_DECORATOR
+	RUBY_ECONV_CRLF_NEWLINE_DECORATOR,
 #else
-#define ECONV_DEFAULT_NEWLINE_DECORATOR 0
+	0,
 #endif
-
+#define ECONV_ERROR_HANDLER_MASK                RUBY_ECONV_ERROR_HANDLER_MASK
+#define ECONV_INVALID_MASK                      RUBY_ECONV_INVALID_MASK
+#define ECONV_INVALID_REPLACE                   RUBY_ECONV_INVALID_REPLACE
+#define ECONV_UNDEF_MASK                        RUBY_ECONV_UNDEF_MASK
+#define ECONV_UNDEF_REPLACE                     RUBY_ECONV_UNDEF_REPLACE
+#define ECONV_UNDEF_HEX_CHARREF                 RUBY_ECONV_UNDEF_HEX_CHARREF
+#define ECONV_DECORATOR_MASK                    RUBY_ECONV_DECORATOR_MASK
+#define ECONV_NEWLINE_DECORATOR_MASK            RUBY_ECONV_NEWLINE_DECORATOR_MASK
+#define ECONV_NEWLINE_DECORATOR_READ_MASK       RUBY_ECONV_NEWLINE_DECORATOR_READ_MASK
+#define ECONV_NEWLINE_DECORATOR_WRITE_MASK      RUBY_ECONV_NEWLINE_DECORATOR_WRITE_MASK
+#define ECONV_UNIVERSAL_NEWLINE_DECORATOR       RUBY_ECONV_UNIVERSAL_NEWLINE_DECORATOR
+#define ECONV_CRLF_NEWLINE_DECORATOR            RUBY_ECONV_CRLF_NEWLINE_DECORATOR
+#define ECONV_CR_NEWLINE_DECORATOR              RUBY_ECONV_CR_NEWLINE_DECORATOR
+#define ECONV_XML_TEXT_DECORATOR                RUBY_ECONV_XML_TEXT_DECORATOR
+#define ECONV_XML_ATTR_CONTENT_DECORATOR        RUBY_ECONV_XML_ATTR_CONTENT_DECORATOR
+#define ECONV_STATEFUL_DECORATOR_MASK           RUBY_ECONV_STATEFUL_DECORATOR_MASK
+#define ECONV_XML_ATTR_QUOTE_DECORATOR          RUBY_ECONV_XML_ATTR_QUOTE_DECORATOR
+#define ECONV_DEFAULT_NEWLINE_DECORATOR         RUBY_ECONV_DEFAULT_NEWLINE_DECORATOR
 /* end of flags for rb_econv_open */
 
 /* flags for rb_econv_convert */
-#define ECONV_PARTIAL_INPUT                     0x00010000
-#define ECONV_AFTER_OUTPUT                      0x00020000
+    RUBY_ECONV_PARTIAL_INPUT                    = 0x00010000,
+    RUBY_ECONV_AFTER_OUTPUT                     = 0x00020000,
+#define ECONV_PARTIAL_INPUT                     RUBY_ECONV_PARTIAL_INPUT
+#define ECONV_AFTER_OUTPUT                      RUBY_ECONV_AFTER_OUTPUT
 /* end of flags for rb_econv_convert */
+RUBY_ECONV_FLAGS_PLACEHOLDER};
 
 RUBY_SYMBOL_EXPORT_END