From 26b9bcaba3d821cc37b7a7a2443a95d8cddda24c Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.de>
Date: Fri, 7 Mar 2003 20:36:08 +0000
Subject: [PATCH] Was using the wrong define for the CUPS soname.

---
 dlls/wineps/init.c   | 6 +++---
 dlls/winspool/info.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/wineps/init.c b/dlls/wineps/init.c
index d376cb734ec..ab692b9ceae 100644
--- a/dlls/wineps/init.c
+++ b/dlls/wineps/init.c
@@ -41,8 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 #ifdef HAVE_CUPS_CUPS_H
 #include <cups/cups.h>
 
-#ifndef CUPS_SONAME
-#define CUPS_SONAME "libcups.so"
+#ifndef SONAME_LIBCUPS
+#define SONAME_LIBCUPS "libcups.so"
 #endif
 
 static void *cupshandle = NULL;
@@ -139,7 +139,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 #ifdef HAVE_CUPS_CUPS_H
 	    /* dynamically load CUPS if not yet loaded */
 	    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;
 	    }
 #endif
diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index 2ed57b132f0..0a647c5b7f1 100644
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -32,8 +32,8 @@
 #include <stddef.h>
 #ifdef HAVE_CUPS_CUPS_H
 # include <cups/cups.h>
-# ifndef CUPS_SONAME
-#  define CUPS_SONAME "libcups.so"
+# ifndef SONAME_LIBCUPS
+#  define SONAME_LIBCUPS "libcups.so"
 # endif
 #endif
 
@@ -157,7 +157,7 @@ CUPS_LoadPrinters(void) {
     PWSTR pwstrNameW;
     HKEY hkeyPrinters, hkeyPrinter;
 
-    cupshandle = wine_dlopen(CUPS_SONAME, RTLD_NOW, NULL, 0);
+    cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, NULL, 0);
     if (!cupshandle) 
 	return FALSE;