Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / backend / ieee1284.c

diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index 6b2d010f0b893ab4cbcf2152652ab7c95d45363a..434db87399180a2c8f597611d273c3e5e0a8c83e 100644 (file)
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -26,6 +26,7 @@
  */
 
 #include "backend-private.h"
+#include <cups/globals.h>
 
 
 /*
@@ -264,7 +265,7 @@ backendGetDeviceID(
     * Get the make, model, and serial numbers...
     */
 
-    num_values = _ppdGet1284Values(device_id, &values);
+    num_values = _cupsGet1284Values(device_id, &values);
 
     if ((sern = cupsGetOption("SERIALNUMBER", num_values, values)) == NULL)
       if ((sern = cupsGetOption("SERN", num_values, values)) == NULL)
@@ -354,7 +355,7 @@ backendGetMakeModel(
   * Look for the description field...
   */
 
-  num_values = _ppdGet1284Values(device_id, &values);
+  num_values = _cupsGet1284Values(device_id, &values);
 
   if ((mdl = cupsGetOption("MODEL", num_values, values)) == NULL)
     mdl = cupsGetOption("MDL", num_values, values);