Signed-off-by: Jeremy White <jwhite@xxxxxxxxxxxxxxx> --- src/spiceqxl_driver.c | 4 ++-- src/spiceqxl_spice_server.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/spiceqxl_driver.c b/src/spiceqxl_driver.c index dea5190..990467f 100644 --- a/src/spiceqxl_driver.c +++ b/src/spiceqxl_driver.c @@ -33,7 +33,7 @@ #include "qxl.h" #include "spiceqxl_driver.h" -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define SPICE_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define QXL_MODE_EX(x_res, y_res) \ QXL_MODE_16_32(x_res, y_res, 0), \ @@ -124,7 +124,7 @@ void init_qxl_rom(qxl_screen_t* qxl, uint32_t rom_size) rom->slots_end = 1; rom->n_surfaces = (NUM_SURFACES); - modes->n_modes = (ARRAY_SIZE(qxl_modes)); + modes->n_modes = (SPICE_ARRAY_SIZE(qxl_modes)); for (i = 0; i < modes->n_modes; i++) { fb = qxl_modes[i].y_res * qxl_modes[i].stride; if (maxfb < fb) { diff --git a/src/spiceqxl_spice_server.c b/src/spiceqxl_spice_server.c index 0432d21..63a3179 100644 --- a/src/spiceqxl_spice_server.c +++ b/src/spiceqxl_spice_server.c @@ -50,7 +50,7 @@ SpiceServer *xspice_get_spice_server(void) /* config string parsing */ -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define SPICE_ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) static int name2enum(const char *string, const char *table[], int entries) { @@ -88,7 +88,7 @@ static const char *stream_video_names[] = { [ SPICE_STREAM_VIDEO_FILTER ] = "filter", }; #define parse_stream_video(_name) \ - name2enum(_name, stream_video_names, ARRAY_SIZE(stream_video_names)) + name2enum(_name, stream_video_names, SPICE_ARRAY_SIZE(stream_video_names)) static const char *compression_names[] = { [ SPICE_IMAGE_COMPRESS_OFF ] = "off", @@ -100,7 +100,7 @@ static const char *compression_names[] = { }; #define parse_compression(_name) \ parse_name(_name, "image compression", \ - compression_names, ARRAY_SIZE(compression_names)) + compression_names, SPICE_ARRAY_SIZE(compression_names)) static const char *wan_compression_names[] = { [ SPICE_WAN_COMPRESSION_AUTO ] = "auto", @@ -109,7 +109,7 @@ static const char *wan_compression_names[] = { }; #define parse_wan_compression(_name) \ parse_name(_name, "wan compression", \ - wan_compression_names, ARRAY_SIZE(wan_compression_names)) + wan_compression_names, SPICE_ARRAY_SIZE(wan_compression_names)) void xspice_set_spice_server_options(OptionInfoPtr options) { -- 1.7.10.4 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel