summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-14 05:56:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-14 05:56:51 +0000
commit914969a0400e4df63d959c45d972d3f58e1ac58c (patch)
tree03a562afefd4d9656291258ce10dac507bd2afc7
parent0c18a4b0f070f72b7d15f4263caca0085b070973 (diff)
* thread.c (rb_thread_priority_set): get rid of C99 feature.
* transcode.c (transcode_search_path): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--thread.c2
-rw-r--r--transcode.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e345e6a37c..42005759c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Thu Aug 14 14:54:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Aug 14 14:56:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_thread_priority_set): get rid of C99 feature.
+
+ * transcode.c (transcode_search_path): ditto.
* vm.c (REWIND_CFP): get rid of statement expressions.
diff --git a/thread.c b/thread.c
index 5032f773ef..78d7d8b54c 100644
--- a/thread.c
+++ b/thread.c
@@ -1879,8 +1879,8 @@ static VALUE
rb_thread_priority_set(VALUE thread, VALUE prio)
{
rb_thread_t *th;
- GetThreadPtr(thread, th);
int priority;
+ GetThreadPtr(thread, th);
rb_secure(4);
diff --git a/transcode.c b/transcode.c
index 73eca38ef1..b064b01762 100644
--- a/transcode.c
+++ b/transcode.c
@@ -205,7 +205,7 @@ transcode_search_path(const char *from, const char *to,
}
found = 0;
-cleanup:
+ cleanup:
while (bfs.queue) {
q = bfs.queue;
bfs.queue = q->next;
@@ -214,8 +214,8 @@ cleanup:
if (found) {
const char *enc = to;
- pathlen = 0;
int depth;
+ pathlen = 0;
while (1) {
st_lookup(bfs.visited, (st_data_t)enc, &val);
if (!val)