From e3dcfd6ac49e2657fa8b7f707c4a01f20f40cc69 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 16 Jan 2012 18:27:09 +0000 Subject: Fix compilation on sane platforms. git-svn-id: http://svn.drobilla.net/serd/trunk@292 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- src/env.c | 2 +- src/serd_internal.h | 6 +++--- src/writer.c | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/env.c b/src/env.c index 65e867a1..8f0b4632 100644 --- a/src/env.c +++ b/src/env.c @@ -247,7 +247,7 @@ serd_env_expand_node(const SerdEnv* env, const size_t len = prefix.len + suffix.len; // FIXME: UTF-8? SerdNode ret = { NULL, len, len, 0, SERD_URI }; ret.buf = (uint8_t*)malloc(ret.n_bytes + 1); - _snprintf((char*)ret.buf, ret.n_bytes + 1, + snprintf((char*)ret.buf, ret.n_bytes + 1, "%s%s", prefix.buf, suffix.buf); return ret; } diff --git a/src/serd_internal.h b/src/serd_internal.h index ba6b5d98..4a19e126 100644 --- a/src/serd_internal.h +++ b/src/serd_internal.h @@ -38,9 +38,9 @@ # define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif -#ifndef fmax -static inline float -fmax(float a, float b) +#ifndef HAVE_FMAX +static inline double +fmax(double a, double b) { return (a < b) ? b : a; } diff --git a/src/writer.c b/src/writer.c index 26b06690..0ea4ea06 100644 --- a/src/writer.c +++ b/src/writer.c @@ -31,7 +31,9 @@ typedef struct { } WriteContext; static const WriteContext WRITE_CONTEXT_NULL = { - SERD_NODE_NULL, SERD_NODE_NULL, SERD_NODE_NULL + { 0, 0, 0, 0, SERD_NOTHING }, + { 0, 0, 0, 0, SERD_NOTHING }, + { 0, 0, 0, 0, SERD_NOTHING } }; struct SerdWriterImpl { -- cgit v1.2.1