Changeset 33c2952 in mainline for uspace/app/trace/proto.c


Ignore:
Timestamp:
2012-11-07T21:00:02Z (14 years ago)
Author:
Adam Hraska <adam.hraska+hos@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
dcb0751
Parents:
fc89e32 (diff), 94795812 (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:

Merged with mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/trace/proto.c

    rfc89e32 r33c2952  
    7979        .key_hash = srv_proto_key_hash,
    8080        .key_equal = srv_proto_key_equal,
    81         .equal = 0,
    82         .remove_callback = 0
     81        .equal = NULL,
     82        .remove_callback = NULL
    8383};
    8484
     
    105105        .key_hash = method_oper_key_hash,
    106106        .key_equal = method_oper_key_equal,
    107         .equal = 0,
    108         .remove_callback = 0
     107        .equal = NULL,
     108        .remove_callback = NULL
    109109};
    110110
Note: See TracChangeset for help on using the changeset viewer.