diff options
| author | David Robillard <d@drobilla.net> | 2012-01-16 19:19:44 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-01-16 19:19:44 +0000 |
| commit | 012e8a8785abcbf403d842d67303d7470b33694c (patch) | |
| tree | 8c456a49780fbbd7534edbf99f83d237a64464c3 | |
| parent | 554dfe14bdf86b00a92fa20f83f4bfac5e85325b (diff) | |
| download | lilv-012e8a8785abcbf403d842d67303d7470b33694c.tar.gz lilv-012e8a8785abcbf403d842d67303d7470b33694c.tar.bz2 lilv-012e8a8785abcbf403d842d67303d7470b33694c.zip | |
Use correct WIN32 define.
git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3954 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | lilv/lilv.h | 2 | ||||
| -rw-r--r-- | src/lilv_internal.h | 2 | ||||
| -rw-r--r-- | src/util.c | 4 | ||||
| -rw-r--r-- | src/zix/common.h | 2 | ||||
| -rw-r--r-- | test/lilv_test.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lilv/lilv.h b/lilv/lilv.h index 28b75a4..f2acf98 100644 --- a/lilv/lilv.h +++ b/lilv/lilv.h @@ -30,7 +30,7 @@ #include "lv2/lv2plug.in/ns/ext/urid/urid.h" #ifdef LILV_SHARED -# ifdef __WIN32__ +# ifdef _WIN32 # define LILV_LIB_IMPORT __declspec(dllimport) # define LILV_LIB_EXPORT __declspec(dllexport) # else diff --git a/src/lilv_internal.h b/src/lilv_internal.h index 856b8fb..e4d1a3f 100644 --- a/src/lilv_internal.h +++ b/src/lilv_internal.h @@ -26,7 +26,7 @@ extern "C" { #include <stdint.h> #include <stdlib.h> -#ifdef __WIN32__ +#ifdef _WIN32 # include <windows.h> # define dlopen(path, flags) LoadLibrary(path) # define dlclose(lib) FreeLibrary(lib) @@ -144,7 +144,7 @@ lilv_expand(const char* path) ret = lilv_strdup(path); } wordfree(&p); -#elif defined(__WIN32__) +#elif defined(_WIN32) static const size_t len = 32767; char* ret = malloc(len); ExpandEnvironmentStrings(path, ret, len); @@ -247,7 +247,7 @@ lilv_path_is_absolute(const char* path) return true; } -#ifdef __WIN32__ +#ifdef _WIN32 if (isalpha(path[0]) && path[1] == ':' && lilv_is_dir_sep(path[2])) { return true; } diff --git a/src/zix/common.h b/src/zix/common.h index c0dffeb..59a9511 100644 --- a/src/zix/common.h +++ b/src/zix/common.h @@ -26,7 +26,7 @@ /** @cond */ #ifdef ZIX_SHARED -# ifdef __WIN32__ +# ifdef _WIN32 # define ZIX_LIB_IMPORT __declspec(dllimport) # define ZIX_LIB_EXPORT __declspec(dllexport) # else diff --git a/test/lilv_test.c b/test/lilv_test.c index 7f7c77b..c5f2b93 100644 --- a/test/lilv_test.c +++ b/test/lilv_test.c @@ -37,7 +37,7 @@ #if defined(__APPLE__) # define SHLIB_EXT ".dylib" -#elif defined(__WIN32__) +#elif defined(_WIN32) # define SHLIB_EXT ".dll" #else # define SHLIB_EXT ".so" |