490a71930d
New with 1.0.22, released 2011-02-13: * New backends: kvs20xx (Panasonic KV-S20xx), magicolor (Konica-Minolta ) * Significant enhancements to several backends. * More than 80 new scanner models supported. * Support many more networked scanners. * Added -A option to scanimage * Improved build system. * Improved USB support. * Improved udev rules. * Documentation updates. * Bugfixes.
24 lines
795 B
Text
24 lines
795 B
Text
$NetBSD: patch-ai,v 1.2 2011/07/12 12:19:41 wiz Exp $
|
|
|
|
Avoid duplicate symbols in libepson and libepson2.
|
|
|
|
--- backend/epson_usb.c.orig 2011-01-16 01:01:28.000000000 +0000
|
|
+++ backend/epson_usb.c
|
|
@@ -4,7 +4,7 @@
|
|
|
|
/* generated with epson2usb.pl doc/descriptions/epson2.desc */
|
|
|
|
-SANE_Word sanei_epson_usb_product_ids[] = {
|
|
+static SANE_Word sanei_epson_usb_product_ids[] = {
|
|
0x101, /* GT-7000U, Perfection 636U */
|
|
0x103, /* GT-6600U, Perfection 610 */
|
|
0x104, /* GT-7600U, GT-7600UF, Perfection 1200U, Perfection 1200U PHOTO */
|
|
@@ -85,7 +85,7 @@ SANE_Word sanei_epson_usb_product_ids[]
|
|
in the config file as "usb <vendor> <product>" */
|
|
};
|
|
|
|
-int
|
|
+static int
|
|
sanei_epson_getNumberOfUSBProductIds (void)
|
|
{
|
|
return sizeof (sanei_epson_usb_product_ids) / sizeof (SANE_Word);
|