From 807b92ca7157d0de52a010ca23e6587e5ac4b641 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 6 Apr 2012 21:16:03 +0000 Subject: Fix compilation on Windows. git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@4150 a436a847-0d15-0410-975c-d299462d15a1 --- src/util.c | 9 +++++---- test/lilv_test.c | 2 +- wscript | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/util.c b/src/util.c index a3109f7..789f5a6 100644 --- a/src/util.c +++ b/src/util.c @@ -28,7 +28,9 @@ #include #include -#ifdef _MSC_VER +#ifdef _WIN32 +# define _WIN32_WINNT 0x0600 /* for CreateSymbolicLink */ +# include # include # include # define F_OK 0 @@ -345,7 +347,6 @@ lilv_size_mtime(const char* path, off_t* size, time_t* time) struct stat buf; if (stat(path, &buf)) { LILV_ERRORF("stat(%s) (%s)\n", path, strerror(errno)); - *size = *time = 0; } if (size) { @@ -370,8 +371,8 @@ update_latest(const char* path, const char* name, void* data) char* entry_path = lilv_path_join(path, name); unsigned num; if (sscanf(entry_path, latest->pattern, &num) == 1) { - off_t entry_size; - time_t entry_time; + off_t entry_size = 0; + time_t entry_time = 0; lilv_size_mtime(entry_path, &entry_size, &entry_time); if (entry_size == latest->orig_size && entry_time >= latest->time) { free(latest->latest); diff --git a/test/lilv_test.c b/test/lilv_test.c index c1da9ba..ea22771 100644 --- a/test/lilv_test.c +++ b/test/lilv_test.c @@ -28,7 +28,7 @@ #include #include -#ifdef _MSC_VER +#ifdef _WIN32 # include # define mkdir(path, flags) _mkdir(path) # define setenv(n, v, r) SetEnvironmentVariable((n), (v)) diff --git a/wscript b/wscript index e6d759f..21d0fff 100644 --- a/wscript +++ b/wscript @@ -193,8 +193,9 @@ def build(bld): lib = ['dl'] libflags = ['-fvisibility=hidden'] defines = [] + if sys.platform == 'win32': + lib = [] if bld.env['MSVC_COMPILER']: - lib = [] libflags = [] defines = ['snprintf=_snprintf'] elif sys.platform.find('bsd') > 0: -- cgit v1.2.1