diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-05-25 00:21:32 +0200 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-05-25 00:21:32 +0200 |
commit | ed5675afcf958e39f3aba183f73209e627672bca (patch) | |
tree | ea9bcc80b6e5ddf6617285a0f8e7a41fcd0b7e02 /common | |
parent | 88b17fc985badc659e3312a6494aedf8237c296b (diff) | |
parent | 44f72e15fcf987c1c1eb6e9c31d8d1bcca81a13c (diff) |
Merge branch 'merge-requests/11'
Diffstat (limited to 'common')
-rw-r--r-- | common/marshaller.c | 2 | ||||
-rw-r--r-- | common/marshaller.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/marshaller.c b/common/marshaller.c index 6ee7b6a..97c65af 100644 --- a/common/marshaller.c +++ b/common/marshaller.c @@ -332,7 +332,7 @@ uint8_t *spice_marshaller_add_ref_full(SpiceMarshaller *m, uint8_t *data, size_t return data; } -uint8_t *spice_marshaller_add(SpiceMarshaller *m, uint8_t *data, size_t size) +uint8_t *spice_marshaller_add(SpiceMarshaller *m, const uint8_t *data, size_t size) { uint8_t *ptr; diff --git a/common/marshaller.h b/common/marshaller.h index 4d77140..ae68e85 100644 --- a/common/marshaller.h +++ b/common/marshaller.h @@ -33,7 +33,7 @@ void spice_marshaller_reset(SpiceMarshaller *m); void spice_marshaller_destroy(SpiceMarshaller *m); uint8_t *spice_marshaller_reserve_space(SpiceMarshaller *m, size_t size); void spice_marshaller_unreserve_space(SpiceMarshaller *m, size_t size); -uint8_t *spice_marshaller_add(SpiceMarshaller *m, uint8_t *data, size_t size); +uint8_t *spice_marshaller_add(SpiceMarshaller *m, const uint8_t *data, size_t size); uint8_t *spice_marshaller_add_ref(SpiceMarshaller *m, uint8_t *data, size_t size); uint8_t *spice_marshaller_add_ref_full(SpiceMarshaller *m, uint8_t *data, size_t size, spice_marshaller_item_free_func free_data, void *opaque); |