From 3ef6271b7f33c655a17a4e7589edddaa61b81295 Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Sun, 22 Feb 2004 10:10:12 +0000 Subject: [PATCH] Port to nsr-tandem-nsk (patch from "Bates, Tom" ). --- Changelog | 6 ++++++ lib/usleep.c | 4 ++++ sanei/sanei_load_values.c | 9 +++++++++ sanei/sanei_save_values.c | 9 +++++++++ 4 files changed, 28 insertions(+) diff --git a/Changelog b/Changelog index 317ea0d..e45991f 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,9 @@ +2004-02-22 Henning Meier-Geinitz + + * lib/usleep.c sanei/sanei_load_values.c + sanei/sanei_save_values.c: Port to nsr-tandem-nsk (patch + from "Bates, Tom" ). + 2004-01-25 Julien BLACHE * src/xscanimage.c: add a call to gimp_extension_ack(), conforming to the GIMP 2.0 plug-in API. Also initial the status to GIMP_PDB_CALLING_ERROR. diff --git a/lib/usleep.c b/lib/usleep.c index 60dfdbc..0be9dd0 100644 --- a/lib/usleep.c +++ b/lib/usleep.c @@ -16,6 +16,10 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef __TANDEM +#include +#endif + #include <../include/sane/config.h> #ifndef HAVE_USLEEP diff --git a/sanei/sanei_load_values.c b/sanei/sanei_load_values.c index dae2c3c..01c8e42 100644 --- a/sanei/sanei_load_values.c +++ b/sanei/sanei_load_values.c @@ -55,6 +55,10 @@ sane backend would do this and since this is SANE, we just proved that this algorithm works perfectly. */ +#ifdef __TANDEM +#include +#endif + #ifdef _AIX # include /* MUST come first for AIX! */ #endif @@ -99,8 +103,13 @@ sanei_load_values (int fd, SANE_Handle device) offset = lseek (fd, 0, SEEK_CUR); w.io.fd = fd; +#ifdef __TANDEM + w.io.read = floss_read; + w.io.write = floss_write; +#else w.io.read = read; w.io.write = write; +#endif sanei_w_init (&w, sanei_codec_ascii_init); sanei_w_set_dir (&w, WIRE_DECODE); keep_going = 0; diff --git a/sanei/sanei_save_values.c b/sanei/sanei_save_values.c index 94e1dea..195947c 100644 --- a/sanei/sanei_save_values.c +++ b/sanei/sanei_save_values.c @@ -38,6 +38,10 @@ whether to permit this exception to apply to your modifications. If you do not wish that, delete this exception notice. */ +#ifdef __TANDEM +#include +#endif + #include "sane/config.h" #include @@ -64,8 +68,13 @@ sanei_save_values (int fd, SANE_Handle device) int i; w.io.fd = fd; +#ifdef __TANDEM + w.io.read = floss_read; + w.io.write = floss_write; +#else w.io.read = read; w.io.write = write; +#endif sanei_w_init (&w, sanei_codec_ascii_init); sanei_w_set_dir (&w, WIRE_ENCODE);