[Spice-commits] 2 commits - client/monitor.h client/pixels_source.h common/canvas_base.h common/draw.h common/lines.h common/lz.h common/marshaller.c common/marshaller.h common/mem.c common/messages.h common/pixman_utils.h common/rect.h common/region.h common/rop3.h common/sw_canvas.h python_modules/demarshal.py
Alexander Larsson
alexl at kemper.freedesktop.org
Thu Jul 8 06:45:07 PDT 2010
client/monitor.h | 2 +-
client/pixels_source.h | 2 +-
common/canvas_base.h | 2 +-
common/draw.h | 2 +-
common/lines.h | 2 +-
common/lz.h | 2 +-
common/marshaller.c | 2 +-
common/marshaller.h | 2 +-
common/mem.c | 4 ++--
common/messages.h | 2 +-
common/pixman_utils.h | 2 +-
common/rect.h | 2 +-
common/region.h | 2 +-
common/rop3.h | 2 +-
common/sw_canvas.h | 2 +-
python_modules/demarshal.py | 2 +-
16 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 925f6387c8b5bd63ecd128c9187d8424607e0fa8
Author: Alexander Larsson <alexl at redhat.com>
Date: Thu Jul 8 15:44:39 2010 +0200
Fix sign warnings from win32 compiler
diff --git a/common/marshaller.c b/common/marshaller.c
index 70008a8..6ee7b6a 100644
--- a/common/marshaller.c
+++ b/common/marshaller.c
@@ -348,7 +348,7 @@ uint8_t *spice_marshaller_add_ref(SpiceMarshaller *m, uint8_t *data, size_t size
void spice_marshaller_add_ref_chunks(SpiceMarshaller *m, SpiceChunks *chunks)
{
- int i;
+ unsigned int i;
for (i = 0; i < chunks->num_chunks; i++) {
spice_marshaller_add_ref(m, chunks->chunk[i].data,
diff --git a/common/mem.c b/common/mem.c
index 427ab43..b0a7eb1 100644
--- a/common/mem.c
+++ b/common/mem.c
@@ -202,7 +202,7 @@ SpiceChunks *spice_chunks_new_linear(uint8_t *data, uint32_t len)
void spice_chunks_destroy(SpiceChunks *chunks)
{
- int i;
+ unsigned int i;
if (chunks->flags & SPICE_CHUNKS_FLAGS_FREE) {
for (i = 0; i < chunks->num_chunks; i++) {
@@ -216,7 +216,7 @@ void spice_chunks_destroy(SpiceChunks *chunks)
void spice_chunks_linearize(SpiceChunks *chunks)
{
uint8_t *data, *p;
- int i;
+ unsigned int i;
if (chunks->num_chunks > 1) {
data = (uint8_t*)spice_malloc(chunks->data_size);
commit 9cc15825615be5f2bb96b21a9e3c6994f6725cd1
Author: Alexander Larsson <alexl at redhat.com>
Date: Thu Jul 8 15:44:15 2010 +0200
Fix inclusion of common files, no need for common/ part
diff --git a/client/monitor.h b/client/monitor.h
index 39d957d..ec31da4 100644
--- a/client/monitor.h
+++ b/client/monitor.h
@@ -18,7 +18,7 @@
#ifndef _H_MONITOR
#define _H_MONITOR
-#include <common/draw.h>
+#include "draw.h"
class Monitor {
public:
diff --git a/client/pixels_source.h b/client/pixels_source.h
index 6e24300..fac9c22 100644
--- a/client/pixels_source.h
+++ b/client/pixels_source.h
@@ -18,7 +18,7 @@
#ifndef _H_PIXELS_SOURCE
#define _H_PIXELS_SOURCE
-#include <common/draw.h>
+#include "draw.h"
#define PIXELES_SOURCE_OPAQUE_SIZE (20 * sizeof(void*))
diff --git a/common/canvas_base.h b/common/canvas_base.h
index 55e1b33..0d25a3f 100644
--- a/common/canvas_base.h
+++ b/common/canvas_base.h
@@ -23,7 +23,7 @@
#include "pixman_utils.h"
#include "lz.h"
#include "region.h"
-#include <common/draw.h>
+#include "draw.h"
typedef void (*spice_destroy_fn_t)(void *data);
diff --git a/common/draw.h b/common/draw.h
index 5741eff..ab9da69 100644
--- a/common/draw.h
+++ b/common/draw.h
@@ -33,7 +33,7 @@
#include <spice/types.h>
#include <spice/enums.h>
-#include <common/mem.h>
+#include "mem.h"
#define SPICE_GET_ADDRESS(addr) ((void *)(unsigned long)(addr))
#define SPICE_SET_ADDRESS(addr, val) ((addr) = (unsigned long)(val))
diff --git a/common/lines.h b/common/lines.h
index 8a60c03..1d092f0 100644
--- a/common/lines.h
+++ b/common/lines.h
@@ -52,7 +52,7 @@ SOFTWARE.
#include <pixman_utils.h>
#include <stdlib.h>
#include <string.h>
-#include <common/draw.h>
+#include "draw.h"
typedef struct lineGC lineGC;
diff --git a/common/lz.h b/common/lz.h
index fb61e10..993609f 100644
--- a/common/lz.h
+++ b/common/lz.h
@@ -8,7 +8,7 @@
#include "lz_common.h"
#include "lz_config.h"
-#include <common/draw.h>
+#include "draw.h"
typedef void *LzContext;
diff --git a/common/marshaller.h b/common/marshaller.h
index e7e6637..4d77140 100644
--- a/common/marshaller.h
+++ b/common/marshaller.h
@@ -20,7 +20,7 @@
#define _H_MARSHALLER
#include <spice/types.h>
-#include <common/mem.h>
+#include "mem.h"
#ifndef WIN32
#include <sys/uio.h>
#endif
diff --git a/common/messages.h b/common/messages.h
index 4cbd80e..a6433b0 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -32,7 +32,7 @@
#define _H_MESSAGES
#include <spice/protocol.h>
-#include <common/draw.h>
+#include "draw.h"
typedef struct SpiceMsgData {
uint32_t data_size;
diff --git a/common/pixman_utils.h b/common/pixman_utils.h
index 45a58ca..e15b682 100644
--- a/common/pixman_utils.h
+++ b/common/pixman_utils.h
@@ -24,7 +24,7 @@
#define PIXMAN_DONT_DEFINE_STDINT
#include <pixman.h>
-#include <common/draw.h>
+#include "draw.h"
/* This lists all possible 2 argument binary raster ops.
* This enum has the same values as the X11 GXcopy type
diff --git a/common/rect.h b/common/rect.h
index 7d8e752..cdd4335 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -19,7 +19,7 @@
#ifndef _H_RECT
#define _H_RECT
-#include <common/draw.h>
+#include "draw.h"
#include <spice/macros.h>
static inline void rect_sect(SpiceRect* r, const SpiceRect* bounds)
diff --git a/common/region.h b/common/region.h
index c90e06f..bad7494 100644
--- a/common/region.h
+++ b/common/region.h
@@ -20,7 +20,7 @@
#define _H_REGION
#include <stdint.h>
-#include <common/draw.h>
+#include "draw.h"
#include <pixman_utils.h>
typedef pixman_region32_t QRegion;
diff --git a/common/rop3.h b/common/rop3.h
index 15f31d4..0211130 100644
--- a/common/rop3.h
+++ b/common/rop3.h
@@ -21,7 +21,7 @@
#include <stdint.h>
-#include <common/draw.h>
+#include "draw.h"
#include "pixman_utils.h"
void do_rop3_with_pattern(uint8_t rop3, pixman_image_t *d, pixman_image_t *s, SpicePoint *src_pos,
diff --git a/common/sw_canvas.h b/common/sw_canvas.h
index 2d55118..473bbc1 100644
--- a/common/sw_canvas.h
+++ b/common/sw_canvas.h
@@ -21,7 +21,7 @@
#include <stdint.h>
-#include <common/draw.h>
+#include "draw.h"
#include "pixman_utils.h"
#include "canvas_base.h"
#include "region.h"
diff --git a/python_modules/demarshal.py b/python_modules/demarshal.py
index e8afabb..96aa146 100644
--- a/python_modules/demarshal.py
+++ b/python_modules/demarshal.py
@@ -1169,7 +1169,7 @@ def write_includes(writer):
writer.writeln("#include <stdio.h>")
writer.writeln("#include <spice/protocol.h>")
writer.writeln("#include <spice/macros.h>")
- writer.writeln("#include <common/mem.h>")
+ writer.writeln('#include "mem.h"')
writer.newline()
writer.writeln("#ifdef _MSC_VER")
writer.writeln("#pragma warning(disable:4101)")
More information about the Spice-commits
mailing list