mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reuse some linux implementations for Mac OS

Browse Source
This commit is contained in:
Jinhao
2015-11-10 23:53:55 +08:00
parent e0765bbf97
commit 41f7545822
7 changed files with 7 additions and 2103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/system/shared_wrapper.cpp
View File

@@ -12,7 +12,7 @@
#include <nana/system/shared_wrapper.hpp>
#include <algorithm>
#include <iterator>
#if defined(NANA_LINUX) or defined(NANA_MACOS)
#if defined(NANA_LINUX) || defined(NANA_MACOS)
#include <dlfcn.h>
#else
#include <windows.h>
@@ -30,7 +30,7 @@ namespace system
module_t open(const char* filename)
{
#if defined(NANA_LINUX) or defined(NANA_MACOS)
#if defined(NANA_LINUX) || defined(NANA_MACOS)
return ::dlopen(filename, RTLD_LAZY);
#else
return ::LoadLibraryA(filename);
@@ -39,7 +39,7 @@ namespace system
void* symbols(module_t handle, const char* symbol)
{
#if defined(NANA_LINUX) or defined(NANA_MACOS)
#if defined(NANA_LINUX) || defined(NANA_MACOS)
return ::dlsym(handle, const_cast<char*>(symbol));
#else
return (void*)(::GetProcAddress(reinterpret_cast<HMODULE>(handle), symbol));
@@ -48,7 +48,7 @@ namespace system
void close(module_t handle)
{
#if defined(NANA_LINUX) or defined(NANA_MACOS)
#if defined(NANA_LINUX) || defined(NANA_MACOS)
::dlclose(handle);
#else
::FreeLibrary(reinterpret_cast<HMODULE>(handle));
@@ -90,7 +90,7 @@ namespace system
std::transform(filename + length - 13, filename + length , std::back_inserter(file), tolower);
if(file == ".nana_shared")
{
#if defined(NANA_LINUX) or defined(NANA_MACOS)
#if defined(NANA_LINUX) || defined(NANA_MACOS)
ofn.replace(length - 13, 13, ".so");
#else
ofn.replace(length - 13, 13, ".DLL");