Was using the wrong define for the CUPS soname.
This commit is contained in:
parent
64eff97f51
commit
26b9bcaba3
|
@ -41,8 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
|
||||||
#ifdef HAVE_CUPS_CUPS_H
|
#ifdef HAVE_CUPS_CUPS_H
|
||||||
#include <cups/cups.h>
|
#include <cups/cups.h>
|
||||||
|
|
||||||
#ifndef CUPS_SONAME
|
#ifndef SONAME_LIBCUPS
|
||||||
#define CUPS_SONAME "libcups.so"
|
#define SONAME_LIBCUPS "libcups.so"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void *cupshandle = NULL;
|
static void *cupshandle = NULL;
|
||||||
|
@ -139,7 +139,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
|
||||||
#ifdef HAVE_CUPS_CUPS_H
|
#ifdef HAVE_CUPS_CUPS_H
|
||||||
/* dynamically load CUPS if not yet loaded */
|
/* dynamically load CUPS if not yet loaded */
|
||||||
if (!cupshandle) {
|
if (!cupshandle) {
|
||||||
cupshandle = wine_dlopen(CUPS_SONAME, RTLD_NOW, NULL, 0);
|
cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, NULL, 0);
|
||||||
if (!cupshandle) cupshandle = (void*)-1;
|
if (!cupshandle) cupshandle = (void*)-1;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -32,8 +32,8 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#ifdef HAVE_CUPS_CUPS_H
|
#ifdef HAVE_CUPS_CUPS_H
|
||||||
# include <cups/cups.h>
|
# include <cups/cups.h>
|
||||||
# ifndef CUPS_SONAME
|
# ifndef SONAME_LIBCUPS
|
||||||
# define CUPS_SONAME "libcups.so"
|
# define SONAME_LIBCUPS "libcups.so"
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -157,7 +157,7 @@ CUPS_LoadPrinters(void) {
|
||||||
PWSTR pwstrNameW;
|
PWSTR pwstrNameW;
|
||||||
HKEY hkeyPrinters, hkeyPrinter;
|
HKEY hkeyPrinters, hkeyPrinter;
|
||||||
|
|
||||||
cupshandle = wine_dlopen(CUPS_SONAME, RTLD_NOW, NULL, 0);
|
cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, NULL, 0);
|
||||||
if (!cupshandle)
|
if (!cupshandle)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue