Module: wine Branch: master Commit: 5016716f6eccf26faac6ca6634eb521e9288a53e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5016716f6eccf26faac6ca663... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:43:29 2020 +0200 winspool: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 0065801d90..593f091c2d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -107,7 +107,6 @@ #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "wine/library.h" #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -887,13 +886,13 @@ static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) static void load_cups(void) { - cupshandle = wine_dlopen( SONAME_LIBCUPS, RTLD_NOW, NULL, 0 ); + cupshandle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); if (!cupshandle) return; TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); #define DO_FUNC(x) \ - p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); \ + p##x = dlsym( cupshandle, #x ); \ if (!p##x) \ { \ ERR("failed to load symbol %s\n", #x); \ @@ -902,7 +901,7 @@ static void load_cups(void) } CUPS_FUNCS; #undef DO_FUNC -#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ) +#define DO_FUNC(x) p##x = dlsym( cupshandle, #x ) CUPS_OPT_FUNCS; #undef DO_FUNC }