components/ruby/ruby-18/patches/09-ruby_marshal_c.patch
author April Chin <april.chin@oracle.com>
Wed, 06 Nov 2013 14:12:13 -0800
branchs11-update
changeset 2813 db0bfa0fa498
parent 2728 components/ruby/patches/09-ruby_marshal_c.patch@bf58c1253c6c
permissions -rw-r--r--
PSARC/2013/269 Add Ruby 1.9.3 and EOF and Remove Ruby 1.8.7 15700054 SUNBT7023596 integrate ruby version 1.9.3 17650189 problem in UTILITY/RUBY
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2728
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
     1
diff -rupN ruby-1.8.7-p374.orig/marshal.c ruby-1.8.7-p374/marshal.c
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
     2
--- ruby-1.8.7-p374.orig/marshal.c	2012-03-01 18:45:35.000000000 -0800
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
     3
+++ ruby-1.8.7-p374/marshal.c	2013-08-10 16:45:24.260126000 -0700
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
     4
@@ -756,7 +756,7 @@ marshal_dump(argc, argv)
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
     5
     VALUE obj, port, a1, a2;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
     6
     int limit = -1;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
     7
     struct dump_arg *arg;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
     8
-    VALUE wrapper;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
     9
+    volatile VALUE wrapper;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    10
 
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    11
     port = Qnil;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    12
     rb_scan_args(argc, argv, "12", &obj, &a1, &a2);
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    13
@@ -1450,7 +1450,8 @@ marshal_load(argc, argv)
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    14
 {
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    15
     VALUE port, proc;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    16
     int major, minor, taint = Qfalse;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    17
-    VALUE v, wrapper;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    18
+    VALUE v;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    19
+    volatile VALUE wrapper;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    20
     struct load_arg *arg;
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    21
 
bf58c1253c6c 17291717 gem install is broken
April Chin <april.chin@oracle.com>
parents:
diff changeset
    22
     rb_scan_args(argc, argv, "11", &port, &proc);