summaryrefslogtreecommitdiff
path: root/backend/ieee1284.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-02-25 00:52:27 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-02-25 00:52:27 +0000
commitf8b3a85b79b8eb74c37c839079ecbf8266a6f4ed (patch)
treeced1b724e207ab15c0c21c198bb3105639e57ff4 /backend/ieee1284.c
parent41681883895f928191cfa6472b453d9753cc26ec (diff)
downloadcups-f8b3a85b79b8eb74c37c839079ecbf8266a6f4ed.tar.gz
Merge changes from CUPS 1.5svn-r9000.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1912 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/ieee1284.c')
-rw-r--r--backend/ieee1284.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index 6b2d010f0..434db8739 100644
--- 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);