From ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 28 Jun 2013 16:47:15 +0200
Subject: fontconfig mesa git update 28 June 2013

fontconfig       commit 197d06c49b01413303f2c92130594daa4fcaa6ad
mesa             commit 24b05ff1581b612ab6dbf4937fa4b644b4e61379
---
 mesalib/src/gallium/auxiliary/util/u_linkage.c | 4 ++--
 mesalib/src/gallium/auxiliary/util/u_prim.h    | 4 ++--
 mesalib/src/gallium/auxiliary/util/u_slab.c    | 2 +-
 mesalib/src/gallium/auxiliary/util/u_staging.c | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'mesalib/src/gallium/auxiliary/util')

diff --git a/mesalib/src/gallium/auxiliary/util/u_linkage.c b/mesalib/src/gallium/auxiliary/util/u_linkage.c
index 2f6f41ba8..245d941dc 100644
--- a/mesalib/src/gallium/auxiliary/util/u_linkage.c
+++ b/mesalib/src/gallium/auxiliary/util/u_linkage.c
@@ -130,12 +130,12 @@ util_semantic_layout_from_set(unsigned char *layout, const struct util_semantic_
       last = i;
    }
 
-   if(last < efficient_slots)
+   if (last < (int) efficient_slots)
    {
       UTIL_SEMANTIC_SET_FOR_EACH(i, set)
          layout[i] = i;
    }
-   else if((last - first) < efficient_slots)
+   else if ((last - first) < (int) efficient_slots)
    {
       UTIL_SEMANTIC_SET_FOR_EACH(i, set)
          layout[i - first] = i;
diff --git a/mesalib/src/gallium/auxiliary/util/u_prim.h b/mesalib/src/gallium/auxiliary/util/u_prim.h
index 8f444a305..8a9cca20a 100644
--- a/mesalib/src/gallium/auxiliary/util/u_prim.h
+++ b/mesalib/src/gallium/auxiliary/util/u_prim.h
@@ -38,8 +38,8 @@ extern "C" {
 #endif
 
 struct u_prim_vertex_count {
-   int min;
-   int incr;
+   unsigned min;
+   unsigned incr;
 };
 
 /**
diff --git a/mesalib/src/gallium/auxiliary/util/u_slab.c b/mesalib/src/gallium/auxiliary/util/u_slab.c
index f9f5ef68f..dbdebc6c9 100644
--- a/mesalib/src/gallium/auxiliary/util/u_slab.c
+++ b/mesalib/src/gallium/auxiliary/util/u_slab.c
@@ -55,7 +55,7 @@ static void util_slab_add_new_page(struct util_slab_mempool *pool)
 {
    struct util_slab_page *page;
    struct util_slab_block *block;
-   int i;
+   unsigned i;
 
    page = MALLOC(pool->page_size);
    insert_at_tail(&pool->list, page);
diff --git a/mesalib/src/gallium/auxiliary/util/u_staging.c b/mesalib/src/gallium/auxiliary/util/u_staging.c
index b5e37932e..b569c8f99 100644
--- a/mesalib/src/gallium/auxiliary/util/u_staging.c
+++ b/mesalib/src/gallium/auxiliary/util/u_staging.c
@@ -84,7 +84,7 @@ util_staging_transfer_init(struct pipe_context *pipe,
    if (usage & PIPE_TRANSFER_READ)
    {
       /* XXX this looks wrong dst is always the same but looping over src z? */
-      unsigned zi;
+      int zi;
       struct pipe_box sbox;
       sbox.x = box->x;
       sbox.y = box->y;
@@ -111,7 +111,7 @@ util_staging_transfer_destroy(struct pipe_context *pipe, struct pipe_transfer *p
    {
       if(tx->base.usage & PIPE_TRANSFER_WRITE) {
          /* XXX this looks wrong src is always the same but looping over dst z? */
-         unsigned zi;
+         int zi;
          struct pipe_box sbox;
          sbox.x = 0;
          sbox.y = 0;
-- 
cgit v1.2.3