Module: wine Branch: master Commit: a18462424fd6cc20fefb364587611d2a86598a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a18462424fd6cc20fefb36458...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Apr 6 11:46:38 2020 +0200
gphoto2.ds: Use standard dlopen() instead of the libwine wrappers.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gphoto2.ds/ds_image.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index 32f526782e..e5df69f4a6 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -27,7 +27,6 @@ #include "gphoto2_i.h" #include "wingdi.h" #include "winuser.h" -#include "wine/library.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(twain); @@ -46,10 +45,10 @@ MAKE_FUNCPTR(jpeg_destroy_decompress);
static void *load_libjpeg(void) { - if((libjpeg_handle = wine_dlopen(SONAME_LIBJPEG, RTLD_NOW, NULL, 0)) != NULL) { + if((libjpeg_handle = dlopen(SONAME_LIBJPEG, RTLD_NOW)) != NULL) {
#define LOAD_FUNCPTR(f) \ - if((p##f = wine_dlsym(libjpeg_handle, #f, NULL, 0)) == NULL) { \ + if((p##f = dlsym(libjpeg_handle, #f)) == NULL) { \ libjpeg_handle = NULL; \ return NULL; \ }