Merge branch '2.4'

2013-04-15 09:09:01 +03:00 · 2013-04-15 09:09:01 +03:00 · 0ccd2c7715
commit 0ccd2c7715
parent 61cba2ae50 42e307b3c5
1 changed files with 1 additions and 1 deletions
--- a/test/suites/api/test_dump.c
+++ b/test/suites/api/test_dump.c
@ -9,7 +9,7 @@
 #include <string.h>
 #include "util.h"

-static int encode_null_callback(void *ptr, size_t size, void *data)
+static int encode_null_callback(char *buffer, size_t size, void *data)
 {
    return 0;
 }