From d69e1fb5c865b09d134eb671a626165a019908d9 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 6 Apr 2012 20:00:50 +0000
Subject: Fix compilation under MSVC.

git-svn-id: http://svn.drobilla.net/lad/trunk/sratom@4147 a436a847-0d15-0410-975c-d299462d15a1
---
 src/sratom.c | 9 ++++++---
 wscript      | 6 ++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/sratom.c b/src/sratom.c
index 646d462..556d4ed 100644
--- a/src/sratom.c
+++ b/src/sratom.c
@@ -16,6 +16,7 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -281,7 +282,7 @@ sratom_write(Sratom*         sratom,
 	} else if (type_urid == sratom->midi_MidiEvent) {
 		new_node = true;
 		datatype = serd_node_from_string(SERD_URI, NS_MIDI "MidiEvent");
-		uint8_t* str = calloc(size * 2 + 1, 1);
+		uint8_t* str = (uint8_t*)calloc(size * 2 + 1, 1);
 		for (uint32_t i = 0; i < size; ++i) {
 			snprintf((char*)str + (2 * i), size * 2 + 1, "%02X",
 			         (unsigned)(uint8_t)*((uint8_t*)body + i));
@@ -424,7 +425,9 @@ sratom_to_turtle(Sratom*         sratom,
 
 	SerdWriter* writer = serd_writer_new(
 		SERD_TURTLE,
-		SERD_STYLE_ABBREVIATED|SERD_STYLE_RESOLVED|SERD_STYLE_CURIED,
+		(SerdStyle)(SERD_STYLE_ABBREVIATED |
+		            SERD_STYLE_RESOLVED |
+		            SERD_STYLE_CURIED),
 		env, &buri, serd_chunk_sink, &str);
 
 	// Write @prefix directives
@@ -549,7 +552,7 @@ read_node(Sratom*         sratom,
 		} else if (language) {
 			const char*  prefix   = "http://lexvo.org/id/iso639-3/";
 			const size_t lang_len = strlen(prefix) + strlen(language);
-			char*        lang_uri = calloc(lang_len + 1, 1);
+			char*        lang_uri = (char*)calloc(lang_len + 1, 1);
 			snprintf(lang_uri, lang_len + 1, "%s%s", prefix, language);
 			lv2_atom_forge_literal(
 				forge, str, len, 0,
diff --git a/wscript b/wscript
index 03a9aee..8db75c2 100644
--- a/wscript
+++ b/wscript
@@ -81,9 +81,11 @@ def build(bld):
 
     libflags = [ '-fvisibility=hidden' ]
     libs     = [ 'm' ]
+    defines  = []
     if bld.env['MSVC_COMPILER']:
         libflags = []
         libs     = []
+        defines  = ['snprintf=_snprintf']
 
     # Shared Library
     obj = bld(features        = 'c cshlib',
@@ -95,6 +97,7 @@ def build(bld):
               target          = 'sratom-%s' % SRATOM_MAJOR_VERSION,
               vnum            = SRATOM_LIB_VERSION,
               install_path    = '${LIBDIR}',
+              defines         = defines,
               cflags          = libflags + [ '-DSRATOM_SHARED',
                                              '-DSRATOM_INTERNAL' ])
     autowaf.use_lib(bld, obj, 'SERD SORD LV2')
@@ -110,6 +113,7 @@ def build(bld):
                   target          = 'sratom-%s' % SRATOM_MAJOR_VERSION,
                   vnum            = SRATOM_LIB_VERSION,
                   install_path    = '${LIBDIR}',
+                  defines         = defines,
                   cflags          = ['-DSRATOM_INTERNAL'])
         autowaf.use_lib(bld, obj, 'SERD SORD LV2')
 
@@ -128,6 +132,7 @@ def build(bld):
                   name         = 'libsratom_profiled',
                   target       = 'sratom_profiled',
                   install_path = '',
+                  defines      = defines,
                   cflags       = test_cflags + ['-DSRATOM_INTERNAL'])
         autowaf.use_lib(bld, obj, 'SERD SORD LV2')
 
@@ -139,6 +144,7 @@ def build(bld):
                   lib          = test_libs,
                   target       = 'sratom_test',
                   install_path = '',
+                  defines      = defines,
                   cflags       = test_cflags)
 
     # Documentation
-- 
cgit v1.2.1