Ignore:
Timestamp:
2010-12-16T16:38:49Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7837101
Parents:
8e58f94 (diff), eb221e5 (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/bd/part/guid_part/guid_part.c

    r8e58f94 r7bdcc45  
    155155
    156156        if (block_size < 512 || (block_size % 512) != 0) {
    157                 printf(NAME ": invalid block size %d.\n");
     157                printf(NAME ": invalid block size %zu.\n", block_size);
    158158                return ENOTSUP;
    159159        }
     
    315315        ipc_callid_t callid;
    316316        ipc_call_t call;
    317         ipcarg_t method;
     317        sysarg_t method;
    318318        devmap_handle_t dh;
    319319        int flags;
     
    360360        while (1) {
    361361                callid = async_get_call(&call);
    362                 method = IPC_GET_METHOD(call);
     362                method = IPC_GET_IMETHOD(call);
    363363                switch (method) {
    364364                case IPC_M_PHONE_HUNGUP:
Note: See TracChangeset for help on using the changeset viewer.