Mirror 1.1.x change.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3154 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index ad6549630f01cd55eeb06c102d092502572c75e1..0071d62d8082e3e14399dffa7b3282dfef4fd079 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,7 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19
 
+       - The USB backend didn't compile on Solaris Intel.
        - The cupstestppd utility now supports the "-q" option
          (quiet) for use in scripts, etc.
        - Merged several weight-reducing changes into the CUPS

diff --git a/backend/usb.c b/backend/usb.c
index 3c442de935699b2871a2db570444e5517846f25f..fc660c01e31b2f9b81017a3ecdbf0c19d3204596 100644 (file)
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb.c,v 1.18.2.23 2003/01/23 18:55:00 mike Exp $"
+ * "$Id: usb.c,v 1.18.2.24 2003/01/27 17:12:27 mike Exp $"
  *
  *   USB port backend for the Common UNIX Printing System (CUPS).
  *
@@ -60,7 +60,11 @@
 #endif /* __linux */
 
 #ifdef __sun
-#  include <sys/ecppio.h>
+#  ifdef __sparc
+#    include <sys/ecppio.h>
+#  else
+#    include <sys/ecppsys.h>
+#  endif /* __sparc */
 #endif /* __sun */
 
 
@@ -744,5 +748,5 @@ open_device(const char *uri)                /* I - Device URI */
 
 
 /*
- * End of "$Id: usb.c,v 1.18.2.23 2003/01/23 18:55:00 mike Exp $".
+ * End of "$Id: usb.c,v 1.18.2.24 2003/01/27 17:12:27 mike Exp $".
  */