* transcode_data.h (base_element): removed.

  (BYTE_LOOKUP): removed.
  (BYTE_LOOKUP_BASE): don't cast.
  (BYTE_LOOKUP_INFO): ditto.
  (PType): unsigned int, instead of uintptr_t.
  (rb_transcoding): change type of next_field, conv_tree_start and
  word_array.

* tool/transcode-tblgen.rb: generate word_array as array of unsigned
  int.

* transcode.c (transcode_restartable0): follow the above type change.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb
index 96f2e8f64..4f77da725 100644
--- a/tool/transcode-tblgen.rb
+++ b/tool/transcode-tblgen.rb
@@ -344,7 +344,7 @@ End
 
     if words_code.empty?
       words_code << <<"End"
-static const uintptr_t
+static const unsigned int
 #{OUTPUT_PREFIX}word_array[0] = {
 };
 End
@@ -358,7 +358,7 @@ End
 
       size = words_code[/\[\d+\]/][1...-1].to_i
       words_code.sub!(/^(\};\n\z)/) {
-        "\#define #{infos_name} (sizeof(uintptr_t)*#{size})\n" +
+        "\#define #{infos_name} (sizeof(unsigned int)*#{size})\n" +
         format_infos(infos) + "\n" +
         $1
       }
@@ -368,7 +368,7 @@ End
 
     size = words_code[/\[\d+\]/][1...-1].to_i
     words_code.sub!(/^(\};\n\z)/) {
-      "\#define #{name} (sizeof(uintptr_t)*#{size})\n" +
+      "\#define #{name} (sizeof(unsigned int)*#{size})\n" +
       <<"End" + "\n" + $1
     #{offsets_name},
     #{infos_name},
@@ -609,7 +609,7 @@ end
 def transcode_generated_code
   TRANSCODE_GENERATED_BYTES_CODE +
     TRANSCODE_GENERATED_WORDS_CODE +
-    "\#define TRANSCODE_TABLE_INFO #{OUTPUT_PREFIX}byte_array, #{OUTPUT_PREFIX}word_array, sizeof(uintptr_t)\n" +
+    "\#define TRANSCODE_TABLE_INFO #{OUTPUT_PREFIX}byte_array, #{OUTPUT_PREFIX}word_array, sizeof(unsigned int)\n" +
     TRANSCODE_GENERATED_TRANSCODER_CODE
 end