Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dynlib-simplify'

Browse Source 
Enhance wxDynamicLibrary error logging and simplify code by not checking
for dlopen() and dlerror() that are always available nowadays.

See https://github.com/wxWidgets/wxWidgets/pull/1849
This commit is contained in:
Vadim Zeitlin
2020-05-21 02:13:10 +02:00
parent d83478e94d 7a82a0bbf5
commit 53a35d15bc
11 changed files with 43 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/cmake/setup.cmake
View File

@@ -614,10 +614,7 @@ set(CMAKE_REQUIRED_LIBRARIES dl)
check_symbol_exists(dlopen dlfcn.h HAVE_DLOPEN)
cmake_pop_check_state()
if(HAVE_DLOPEN)
check_symbol_exists(dlerror dlfcn.h HAVE_DLERROR)
check_symbol_exists(dladdr dlfcn.h HAVE_DLADDR)
else()
check_symbol_exists(shl_load dl.h HAVE_SHL_LOAD)
endif()
check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)

6
build/cmake/setup.h.in
View File

@@ -984,9 +984,6 @@
/* Define if you have pthread_attr_setstacksize */
#cmakedefine HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
/* Define if you have shl_load() */
#cmakedefine HAVE_SHL_LOAD 1
/* Define if you have snprintf() */
#cmakedefine HAVE_SNPRINTF 1
@@ -1089,9 +1086,6 @@
/* Define if wchar_t is distinct type in your compiler. */
#cmakedefine wxWCHAR_T_IS_REAL_TYPE 1
/* Define if you have the dlerror function. */
#cmakedefine HAVE_DLERROR 1
/* Define if you have the dladdr function. */
#cmakedefine HAVE_DLADDR 1