Changeset 4e6577c in mainline

Timestamp:

2011-08-20T13:42:22Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c916dfc, e64df9a

Parents:

abf04a54 (diff), f41682c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 64-bit build fix from Martin Sucha.

Location:

uspace/app/bdsh

Files:

• tok.c (modified) (1 diff)
• tok.h (modified) (2 diffs)

uspace/app/bdsh/tok.c

@@ -224 +224 @@
 wchar_t tok_look_char(tokenizer_t *tok)
 {
-        unsigned int old_offset = tok->in_offset;
-        unsigned int old_char_offset = tok->in_char_offset;
+        size_t old_offset = tok->in_offset;
+        size_t old_char_offset = tok->in_char_offset;
         wchar_t ret = tok_get_char(tok);
         tok->in_offset = old_offset;

uspace/app/bdsh/tok.h

@@ -38 +38 @@
 typedef struct {
         char *text;
-        unsigned int byte_start;
-        unsigned int char_start;
+        size_t byte_start;
+        size_t char_start;
         size_t byte_length;
         size_t char_length;
@@ -47 +47 @@
 typedef struct {
         char *in;
-        unsigned int in_offset;
-        unsigned int last_in_offset;
-        unsigned int in_char_offset;
-        unsigned int last_in_char_offset;
+        size_t in_offset;
+        size_t last_in_offset;
+        size_t in_char_offset;
+        size_t last_in_char_offset;
         
         char *outbuf;