Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 4e6577c in mainline


Ignore:
Timestamp:
2011-08-20T13:42:22Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
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:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/bdsh/tok.c

    rabf04a54 r4e6577c  
    224224wchar_t tok_look_char(tokenizer_t *tok)
    225225{
    226         unsigned int old_offset = tok->in_offset;
    227         unsigned int old_char_offset = tok->in_char_offset;
     226        size_t old_offset = tok->in_offset;
     227        size_t old_char_offset = tok->in_char_offset;
    228228        wchar_t ret = tok_get_char(tok);
    229229        tok->in_offset = old_offset;
  • uspace/app/bdsh/tok.h

    rabf04a54 r4e6577c  
    3838typedef struct {
    3939        char *text;
    40         unsigned int byte_start;
    41         unsigned int char_start;
     40        size_t byte_start;
     41        size_t char_start;
    4242        size_t byte_length;
    4343        size_t char_length;
     
    4747typedef struct {
    4848        char *in;
    49         unsigned int in_offset;
    50         unsigned int last_in_offset;
    51         unsigned int in_char_offset;
    52         unsigned int last_in_char_offset;
     49        size_t in_offset;
     50        size_t last_in_offset;
     51        size_t in_char_offset;
     52        size_t last_in_char_offset;
    5353       
    5454        char *outbuf;
Note: See TracChangeset for help on using the changeset viewer.