Mercurial > hg > orthanc
diff Plugins/Engine/SharedLibrary.cpp @ 1976:325772dadcd6
Macro "__linux" (now obsolete) replaced by macro "__linux__"
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 14 Apr 2016 17:34:43 +0200 |
| parents | b1291df2f780 |
| children | dd609a99d39a |
line wrap: on
line diff
--- a/Plugins/Engine/SharedLibrary.cpp Tue Apr 12 18:30:55 2016 +0000 +++ b/Plugins/Engine/SharedLibrary.cpp Thu Apr 14 17:34:43 2016 +0200 @@ -45,7 +45,7 @@ #if defined(_WIN32) #include <windows.h> -#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) +#elif defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) #include <dlfcn.h> #else #error Support your platform here @@ -65,7 +65,7 @@ throw OrthancException(ErrorCode_SharedLibrary); } -#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) +#elif defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) handle_ = ::dlopen(path_.c_str(), RTLD_NOW); if (handle_ == NULL) { @@ -91,7 +91,7 @@ { #if defined(_WIN32) ::FreeLibrary((HMODULE)handle_); -#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) +#elif defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) ::dlclose(handle_); #else #error Support your platform here @@ -109,7 +109,7 @@ #if defined(_WIN32) return ::GetProcAddress((HMODULE)handle_, name.c_str()); -#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) +#elif defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) return ::dlsym(handle_, name.c_str()); #else #error Support your platform here