mesa: Branch 'master' - 2 commits

[Oliver McFadden]

 src/mesa/drivers/dri/r300/r300_cmdbuf.c |    4 ++--
 src/mesa/drivers/dri/r300/r300_ioctl.c  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree b3a9a90cdf7c30b81c749037784428274d997549 (from 7f08dd3fc6bb23ddef5e7bea827282c8d7c82899)
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Thu Mar 15 18:29:13 2007 +0000

    r300: Fixed a printf conversion warning.

diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index e4511e0..a106bbc 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -545,9 +545,9 @@ void r300InitCmdBuf(r300ContextPtr r300)
 		size = 64*256;
 
 	if (RADEON_DEBUG & (DEBUG_IOCTL|DEBUG_DMA)) {
-		fprintf(stderr, "sizeof(drm_r300_cmd_header_t)=%u\n",
+		fprintf(stderr, "sizeof(drm_r300_cmd_header_t)=%zd\n",
 			sizeof(drm_r300_cmd_header_t));
-		fprintf(stderr, "sizeof(drm_radeon_cmd_buffer_t)=%u\n",
+		fprintf(stderr, "sizeof(drm_radeon_cmd_buffer_t)=%zd\n",
 			sizeof(drm_radeon_cmd_buffer_t));
 		fprintf(stderr,
 			"Allocating %d bytes command buffer (max state is %d bytes)\n",
diff-tree 7f08dd3fc6bb23ddef5e7bea827282c8d7c82899 (from fc6b8f2d3012f97d5a1f0d4fbefd191268d6a263)
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Thu Mar 15 18:26:01 2007 +0000

    r300: Fixed "no previous prototype for 'r300RefillCurrentDmaRegion'" warning.

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index f674fea..11e2d42 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -389,7 +389,7 @@ void r300Flush(GLcontext * ctx)
 #ifdef USER_BUFFERS
 #include "radeon_mm.h"
 
-void r300RefillCurrentDmaRegion(r300ContextPtr rmesa, int size)
+static void r300RefillCurrentDmaRegion(r300ContextPtr rmesa, int size)
 {
 	struct r300_dma_buffer *dmabuf;
 	size = MAX2(size, RADEON_BUFFER_SIZE*16);
@@ -503,7 +503,7 @@ void r300AllocDmaRegion(r300ContextPtr r
 }
 
 #else
-void r300RefillCurrentDmaRegion(r300ContextPtr rmesa)
+static void r300RefillCurrentDmaRegion(r300ContextPtr rmesa)
 {
 	struct r300_dma_buffer *dmabuf;
 	int fd = rmesa->radeon.dri.fd;