Move SpiceChunks to mem.h

This commit is contained in:
Alexander Larsson 2010-07-08 14:17:24 +02:00
parent 0659fb7897
commit 1d64d39844
3 changed files with 19 additions and 19 deletions

View File

@ -33,6 +33,7 @@
#include <spice/types.h>
#include <spice/enums.h>
#include <common/mem.h>
#include <spice/start-packed.h>
@ -101,23 +102,6 @@ typedef struct SPICE_ATTR_PACKED SpiceImageDescriptor {
uint32_t height;
} SpiceImageDescriptor;
typedef struct SPICE_ATTR_PACKED SpiceChunk {
uint8_t *data;
uint32_t len;
} SpiceChunk;
enum {
SPICE_CHUNKS_FLAGS_UNSTABLE = (1<<0),
SPICE_CHUNKS_FLAGS_FREE = (1<<1)
};
typedef struct SPICE_ATTR_PACKED SpiceChunks {
uint32_t data_size;
uint32_t num_chunks;
uint32_t flags;
SpiceChunk chunk[0];
} SpiceChunks;
typedef struct SPICE_ATTR_PACKED SpiceBitmap {
uint8_t format;
uint8_t flags;

View File

@ -20,7 +20,7 @@
#define _H_MARSHALLER
#include <spice/types.h>
#include <common/draw.h> /* for SpiceChunk, temporary */
#include <common/mem.h>
#ifndef WIN32
#include <sys/uio.h>
#endif

View File

@ -21,7 +21,23 @@
#include <stdlib.h>
#include <spice/macros.h>
#include <common/draw.h> /* for SpiceChunks, temporary */
typedef struct SpiceChunk {
uint8_t *data;
uint32_t len;
} SpiceChunk;
enum {
SPICE_CHUNKS_FLAGS_UNSTABLE = (1<<0),
SPICE_CHUNKS_FLAGS_FREE = (1<<1)
};
typedef struct SpiceChunks {
uint32_t data_size;
uint32_t num_chunks;
uint32_t flags;
SpiceChunk chunk[0];
} SpiceChunks;
char *spice_strdup(const char *str) SPICE_GNUC_MALLOC;
char *spice_strndup(const char *str, size_t n_bytes) SPICE_GNUC_MALLOC;