Port to nsr-tandem-nsk (patch from "Bates, Tom" <tom.bates at hp.com>).

33-incorporate-downstream-patches
Henning Geinitz 2004-02-22 10:10:12 +00:00
rodzic 72d9904d34
commit 3ef6271b7f
4 zmienionych plików z 28 dodań i 0 usunięć

Wyświetl plik

@ -1,3 +1,9 @@
2004-02-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* lib/usleep.c sanei/sanei_load_values.c
sanei/sanei_save_values.c: Port to nsr-tandem-nsk (patch
from "Bates, Tom" <tom.bates at hp.com>).
2004-01-25 Julien BLACHE <jb@jblache.org> 2004-01-25 Julien BLACHE <jb@jblache.org>
* src/xscanimage.c: add a call to gimp_extension_ack(), conforming * 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. to the GIMP 2.0 plug-in API. Also initial the status to GIMP_PDB_CALLING_ERROR.

Wyświetl plik

@ -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, not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */ Cambridge, MA 02139, USA. */
#ifdef __TANDEM
#include <floss.h>
#endif
#include <../include/sane/config.h> #include <../include/sane/config.h>
#ifndef HAVE_USLEEP #ifndef HAVE_USLEEP

Wyświetl plik

@ -55,6 +55,10 @@
sane backend would do this and since this is SANE, we just proved sane backend would do this and since this is SANE, we just proved
that this algorithm works perfectly. */ that this algorithm works perfectly. */
#ifdef __TANDEM
#include <floss.h>
#endif
#ifdef _AIX #ifdef _AIX
# include <lalloca.h> /* MUST come first for AIX! */ # include <lalloca.h> /* MUST come first for AIX! */
#endif #endif
@ -99,8 +103,13 @@ sanei_load_values (int fd, SANE_Handle device)
offset = lseek (fd, 0, SEEK_CUR); offset = lseek (fd, 0, SEEK_CUR);
w.io.fd = fd; w.io.fd = fd;
#ifdef __TANDEM
w.io.read = floss_read;
w.io.write = floss_write;
#else
w.io.read = read; w.io.read = read;
w.io.write = write; w.io.write = write;
#endif
sanei_w_init (&w, sanei_codec_ascii_init); sanei_w_init (&w, sanei_codec_ascii_init);
sanei_w_set_dir (&w, WIRE_DECODE); sanei_w_set_dir (&w, WIRE_DECODE);
keep_going = 0; keep_going = 0;

Wyświetl plik

@ -38,6 +38,10 @@
whether to permit this exception to apply to your modifications. whether to permit this exception to apply to your modifications.
If you do not wish that, delete this exception notice. */ If you do not wish that, delete this exception notice. */
#ifdef __TANDEM
#include <floss.h>
#endif
#include "sane/config.h" #include "sane/config.h"
#include <stdlib.h> #include <stdlib.h>
@ -64,8 +68,13 @@ sanei_save_values (int fd, SANE_Handle device)
int i; int i;
w.io.fd = fd; w.io.fd = fd;
#ifdef __TANDEM
w.io.read = floss_read;
w.io.write = floss_write;
#else
w.io.read = read; w.io.read = read;
w.io.write = write; w.io.write = write;
#endif
sanei_w_init (&w, sanei_codec_ascii_init); sanei_w_init (&w, sanei_codec_ascii_init);
sanei_w_set_dir (&w, WIRE_ENCODE); sanei_w_set_dir (&w, WIRE_ENCODE);