diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-15 11:29:05 +0200 |
| commit | 324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch) | |
| tree | bd2d48a139bfbe869f4f49359b63097931a45e7b /backend/epsonds.h | |
| parent | 2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff) | |
| parent | 1edb02101a9306fc711cd422ed507d18165b1691 (diff) | |
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/epsonds.h')
| -rw-r--r-- | backend/epsonds.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/backend/epsonds.h b/backend/epsonds.h index 024773b..0427ef3 100644 --- a/backend/epsonds.h +++ b/backend/epsonds.h @@ -43,13 +43,6 @@ #include "sane/sanei_usb.h" #include "sane/sanei_jpeg.h" -#ifdef __GNUC__ -#define __func__ __FUNCTION__ -#else -#define __func__ "(undef)" -/* I cast my vote for C99... :) */ -#endif - #define EPSONDS_CONFIG_FILE "epsonds.conf" #ifndef PATH_MAX @@ -94,7 +87,7 @@ typedef enum { /* hardware connection to the scanner */ SANE_EPSONDS_NODEV, /* default, no HW specified yet */ SANE_EPSONDS_USB, /* USB interface */ - SANE_EPSONDS_NET /* network interface (unsupported)*/ + SANE_EPSONDS_NET /* network interface */ } epsonds_conn_type; /* hardware description */ @@ -180,6 +173,10 @@ struct epsonds_scanner struct jpeg_decompress_struct jpeg_cinfo; struct jpeg_error_mgr jpeg_err; SANE_Bool jpeg_header_seen; + + /* network buffers */ + unsigned char *netbuf, *netptr; + size_t netlen; }; typedef struct epsonds_scanner epsonds_scanner; |