summaryrefslogtreecommitdiff
path: root/src/mesa/shader/grammar
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-09-26 14:09:04 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2008-09-26 14:09:04 +0100
commitfb8db63a89c4ac7fbbbc0912e1dde0871ae9c35c (patch)
tree3d6f43bc2b9bc977216e0d8b67ea9976854d3c8c /src/mesa/shader/grammar
parentbb6a69d1696cacf828a3de21bc57678c0e4aa54a (diff)
parent1e3a44fab068f00378613456036716d0c3772969 (diff)
Merge commit 'origin/master' into HEAD
Conflicts: src/mesa/vbo/vbo.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/mesa/shader/grammar')
-rw-r--r--src/mesa/shader/grammar/grammar_crt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/shader/grammar/grammar_crt.c b/src/mesa/shader/grammar/grammar_crt.c
index bdf2da9b2e..d2c95d1c8e 100644
--- a/src/mesa/shader/grammar/grammar_crt.c
+++ b/src/mesa/shader/grammar/grammar_crt.c
@@ -10,17 +10,17 @@ void grammar_alloc_free (void *ptr)
free (ptr);
}
-void *grammar_alloc_malloc (unsigned int size)
+void *grammar_alloc_malloc (size_t size)
{
return malloc (size);
}
-void *grammar_alloc_realloc (void *ptr, unsigned int old_size, unsigned int size)
+void *grammar_alloc_realloc (void *ptr, size_t old_size, size_t size)
{
return realloc (ptr, size);
}
-void *grammar_memory_copy (void *dst, const void * src, unsigned int size)
+void *grammar_memory_copy (void *dst, const void * src, size_t size)
{
return memcpy (dst, src, size);
}
@@ -30,7 +30,7 @@ int grammar_string_compare (const byte *str1, const byte *str2)
return strcmp ((const char *) str1, (const char *) str2);
}
-int grammar_string_compare_n (const byte *str1, const byte *str2, unsigned int n)
+int grammar_string_compare_n (const byte *str1, const byte *str2, size_t n)
{
return strncmp ((const char *) str1, (const char *) str2, n);
}
@@ -40,7 +40,7 @@ byte *grammar_string_copy (byte *dst, const byte *src)
return (byte *) strcpy ((char *) dst, (const char *) src);
}
-byte *grammar_string_copy_n (byte *dst, const byte *src, unsigned int n)
+byte *grammar_string_copy_n (byte *dst, const byte *src, size_t n)
{
return (byte *) strncpy ((char *) dst, (const char *) src, n);
}