[macruby-changes] [197] MacRuby/trunk/ext

[source_changes at macosforge.org]

Revision: 197
          http://trac.macosforge.org/projects/ruby/changeset/197
Author:   lsansonetti at apple.com
Date:     2008-05-15 23:34:38 -0700 (Thu, 15 May 2008)

Log Message:
-----------
fixing build

Modified Paths:
--------------
    MacRuby/trunk/ext/readline/readline.c
    MacRuby/trunk/ext/stringio/stringio.c

Modified: MacRuby/trunk/ext/readline/readline.c
===================================================================
--- MacRuby/trunk/ext/readline/readline.c	2008-05-16 00:36:24 UTC (rev 196)
+++ MacRuby/trunk/ext/readline/readline.c	2008-05-16 06:34:38 UTC (rev 197)
@@ -69,7 +69,7 @@
 readline_readline(int argc, VALUE *argv, VALUE self)
 {
     VALUE tmp, add_hist, result;
-    char *prompt = NULL;
+    const char *prompt = NULL;
     char *buff;
     int status;
 
@@ -103,7 +103,9 @@
     }
     if (buff) {
 	result = rb_tainted_str_new2(buff);
+#if !WITH_OBJC
 	rb_enc_associate(result, rb_locale_encoding());
+#endif
     }
     else
 	result = Qnil;
@@ -288,7 +290,7 @@
     if (rl_completion_append_character == '\0')
 	return Qnil;
 
-    str = rb_str_new(&rl_completion_append_character, 1);
+    str = rb_str_new((char *)&rl_completion_append_character, 1);
     return str;
 #else
     rb_notimplement();
@@ -579,7 +581,7 @@
     entry = remove_history(index);
     if (entry) {
         val = rb_tainted_str_new2(entry->line);
-        free(entry->line);
+        free((void *)entry->line);
         free(entry);
         return val;
     }

Modified: MacRuby/trunk/ext/stringio/stringio.c
===================================================================
--- MacRuby/trunk/ext/stringio/stringio.c	2008-05-16 00:36:24 UTC (rev 196)
+++ MacRuby/trunk/ext/stringio/stringio.c	2008-05-16 06:34:38 UTC (rev 197)
@@ -639,7 +639,11 @@
 	return Qnil;
     }
     p = RSTRING_PTR(ptr->string)+ptr->pos;
+#if WITH_OBJC
+    len = 1;
+#else
     len = rb_enc_mbclen(p, RSTRING_END(ptr->string), enc);
+#endif
     ptr->pos += len;
     return rb_enc_str_new(p, len, rb_enc_get(ptr->string));
 }
@@ -700,11 +704,15 @@
     if (NIL_P(c)) return Qnil;
     if (FIXNUM_P(c)) {
 	int cc = FIX2INT(c);
+#if WITH_OBJC
+	c = rb_str_new((char *)&cc, 1);
+#else
 	char buf[16];
 
 	enc = rb_enc_get(ptr->string);
 	rb_enc_mbcput(cc, buf, enc);
 	c = rb_enc_str_new(buf, rb_enc_codelen(cc, enc), enc);
+#endif
     }
     else {
 	SafeStringValue(c);
@@ -713,7 +721,11 @@
     /* get logical position */
     lpos = 0; p = RSTRING_PTR(ptr->string); pend = p + ptr->pos - 1;
     for (;;) {
+#if WITH_OBJC
+	clen = 1;
+#else
 	clen = rb_enc_mbclen(p, pend, enc);
+#endif
 	if (p+clen >= pend) break;
 	p += clen;
 	lpos++;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macruby-changes/attachments/20080515/8c98277b/attachment-0001.htm