summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-10-17 14:52:51 +0200
committerDavid Robillard <d@drobilla.net>2019-10-17 14:52:51 +0200
commit3834185601c6c1a16cd9c9415c7af9c8c4d18784 (patch)
tree3860c4efe73451eac4d9073a83e0bf743998e62d
parent5d5d2b96b1552b8ed8245765be6dc903fa5c5fd4 (diff)
downloadlilv-3834185601c6c1a16cd9c9415c7af9c8c4d18784.tar.gz
lilv-3834185601c6c1a16cd9c9415c7af9c8c4d18784.tar.bz2
lilv-3834185601c6c1a16cd9c9415c7af9c8c4d18784.zip
Fix Windows warnings
-rw-r--r--src/util.c6
-rw-r--r--test/lilv_test.c3
-rw-r--r--test/test.lv2/test.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/src/util.c b/src/util.c
index 306a3a4..39f13c0 100644
--- a/src/util.c
+++ b/src/util.c
@@ -42,7 +42,7 @@
#ifdef __cplusplus
extern "C"
#endif
-BOOLEAN WINAPI
+static BOOLEAN WINAPI
CreateSymbolicLink(LPCTSTR linkpath, LPCTSTR targetpath, DWORD flags)
{
typedef BOOLEAN (WINAPI* PFUNC)(LPCTSTR, LPCTSTR, DWORD);
@@ -180,6 +180,8 @@ lilv_get_lang(void)
return lang;
}
+#ifndef _WIN32
+
/** Append suffix to dst, update dst_len, and return the realloc'd result. */
static char*
strappend(char* dst, size_t* dst_len, const char* suffix, size_t suffix_len)
@@ -204,6 +206,8 @@ append_var(char* dst, size_t* dst_len, const char* var)
}
}
+#endif
+
/** Expand variables (e.g. POSIX ~ or $FOO, Windows %FOO%) in `path`. */
char*
lilv_expand(const char* path)
diff --git a/test/lilv_test.c b/test/lilv_test.c
index ed8b862..7231c24 100644
--- a/test/lilv_test.c
+++ b/test/lilv_test.c
@@ -1482,6 +1482,8 @@ test_ui(void)
/*****************************************************************************/
+#ifndef _WIN32
+
uint32_t atom_Float = 0;
float in = 1.0;
float out = 42.0;
@@ -1570,7 +1572,6 @@ lilv_make_path(LV2_State_Make_Path_Handle handle,
return lilv_path_join(temp_dir, path);
}
-#ifndef _WIN32
static int
test_state(void)
{
diff --git a/test/test.lv2/test.c b/test/test.lv2/test.c
index c1cf4d7..d6802a6 100644
--- a/test/test.lv2/test.c
+++ b/test/test.lv2/test.c
@@ -22,7 +22,7 @@
#include "lv2/state/state.h"
#include "lv2/urid/urid.h"
-#ifdef _WIN32
+#ifdef _MSC_VER
# include <io.h>
# define mkstemp(pat) _mktemp(pat)
#endif