Commit ae9e1896 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

remove conflicts

parent 0c286b9a
......@@ -61,22 +61,13 @@ void __po_hi_marshall_port (__po_hi_port_t value, __po_hi_msg_t* msg)
__po_hi_msg_swap_value (&value, &tmpvalue, sizeof (__po_hi_port_t));
}
__po_hi_msg_append_data (msg, &tmpvalue, sizeof(__po_hi_port_t));
<<<<<<< HEAD
=======
>>>>>>> feb150a54486a886b14651a99a7eb94ec580d30f
}
void __po_hi_unmarshall_port (__po_hi_port_t* value, __po_hi_msg_t* msg)
{
<<<<<<< HEAD
__po_hi_port_t tmpvalue;
=======
__po_hi_port_t tmpvalue;
>>>>>>> feb150a54486a886b14651a99a7eb94ec580d30f
__po_hi_msg_get_data (value, msg, 0, sizeof(__po_hi_port_t));
if (sizeof (__po_hi_port_t) > 1
......@@ -91,11 +82,7 @@ void __po_hi_unmarshall_port (__po_hi_port_t* value, __po_hi_msg_t* msg)
void __po_hi_marshall_array (void* value, __po_hi_msg_t* msg,__po_hi_uint32_t size, __po_hi_uint32_t* offset)
{
<<<<<<< HEAD
=======
// XXX
>>>>>>> feb150a54486a886b14651a99a7eb94ec580d30f
__po_hi_msg_append_data (msg, value, size);
*offset = *offset + size;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment