summaryrefslogtreecommitdiff
path: root/src/compositor-x11.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2013-05-24 13:09:43 +0200
committerKristian Høgsberg <krh@bitplanet.net>2013-05-28 15:27:45 -0400
commitedddbd14acd98ba43081165524e93a6a0d2b3369 (patch)
tree714de6ca7d1d19b388d1ac6229b86599fe4edc55 /src/compositor-x11.c
parent14e438c8a2bc7342489d248a3d66b9123245d552 (diff)
downloadweston-edddbd14acd98ba43081165524e93a6a0d2b3369.tar.gz
Convert all scales to int32_t
The type changed in the protocol, so update weston for this.
Diffstat (limited to 'src/compositor-x11.c')
-rw-r--r--src/compositor-x11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index 279f1b34..3ed6af53 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -114,7 +114,7 @@ struct x11_output {
int shm_id;
void *buf;
uint8_t depth;
- uint32_t scale;
+ int32_t scale;
};
static struct xkb_keymap *
@@ -777,7 +777,7 @@ static struct x11_output *
x11_compositor_create_output(struct x11_compositor *c, int x, int y,
int width, int height, int fullscreen,
int no_input, char *configured_name,
- uint32_t transform, uint32_t scale)
+ uint32_t transform, int32_t scale)
{
static const char name[] = "Weston Compositor";
static const char class[] = "weston-1\0Weston Compositor";