Merge branch '2.4'

This commit is contained in:
Petri Lehtinen 2013-04-15 09:15:35 +03:00
commit 70232676f7

View file

@ -9,8 +9,11 @@
#include <string.h>
#include "util.h"
static int encode_null_callback(char *buffer, size_t size, void *data)
static int encode_null_callback(const char *buffer, size_t size, void *data)
{
(void)buffer;
(void)size;
(void)data;
return 0;
}