From 012e8a8785abcbf403d842d67303d7470b33694c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 16 Jan 2012 19:19:44 +0000 Subject: Use correct WIN32 define. git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3954 a436a847-0d15-0410-975c-d299462d15a1 --- src/lilv_internal.h | 2 +- src/util.c | 4 ++-- src/zix/common.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') 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 #include -#ifdef __WIN32__ +#ifdef _WIN32 # include # define dlopen(path, flags) LoadLibrary(path) # define dlclose(lib) FreeLibrary(lib) diff --git a/src/util.c b/src/util.c index 12821ff..d52f62a 100644 --- a/src/util.c +++ b/src/util.c @@ -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 -- cgit v1.2.1