summaryrefslogtreecommitdiff
path: root/backend/ieee1284.c
diff options
context:
space:
mode:
authorjlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be>2006-02-28 17:54:14 +0000
committerjlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be>2006-02-28 17:54:14 +0000
commitb423cd4cb9fa8cf030cc046a59c28196f3edf6b4 (patch)
tree021000e676623cbf68e9af3e1637c853d7cfbf78 /backend/ieee1284.c
parentecdc06282a65bd04f801c877d2ceb83106d737e1 (diff)
downloadcups-b423cd4cb9fa8cf030cc046a59c28196f3edf6b4.tar.gz
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@69 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/ieee1284.c')
-rw-r--r--backend/ieee1284.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index 6152c4c7a..52f27db18 100644
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -1,5 +1,5 @@
/*
- * "$Id: ieee1284.c 4903 2006-01-10 20:02:46Z mike $"
+ * "$Id: ieee1284.c 5198 2006-02-27 21:58:43Z mike $"
*
* IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
*
@@ -76,9 +76,9 @@ get_device_id(
#ifdef __linux
int length; /* Length of device ID info */
#endif /* __linux */
-#ifdef __sun
+#if defined(__sun) && defined(ECPPIOC_GETDEVID)
struct ecpp_device_id did; /* Device ID buffer */
-#endif /* __sun */
+#endif /* __sun && ECPPIOC_GETDEVID */
DEBUG_printf(("get_device_id(fd=%d, device_id=%p, device_id_size=%d, "
"make_model=%p, make_model_size=%d, scheme=\"%s\", "
@@ -369,5 +369,5 @@ get_device_id(
/*
- * End of "$Id: ieee1284.c 4903 2006-01-10 20:02:46Z mike $".
+ * End of "$Id: ieee1284.c 5198 2006-02-27 21:58:43Z mike $".
*/