ad-hoc changes for FreeBSD

Kaz Sasayama (Kaz.Sasayama@hypercore.co.jp)
04 Mar 1998 09:53:28 +0900

I have a report from a Japanese user that the following
changes were required to compile SANE 0.71 on FreeBSD.

*** tools/Makefile.in 1998/03/01 18:51:29 1.1
--- tools/Makefile.in 1998/03/01 18:51:46
***************
*** 63,69 ****

find-scanner: find-scanner.o \
../sanei/sanei_scsi.lo ../sanei/sanei_init_debug.lo
! @$(LIBTOOL) $(MLINK) $(LINK) find-scanner.o $(LIBSANEI) $(LIBLIB)

depend:
makedepend $(INCLUDES) *.c
--- 63,69 ----

find-scanner: find-scanner.o \
../sanei/sanei_scsi.lo ../sanei/sanei_init_debug.lo
! @$(LIBTOOL) $(MLINK) $(LINK) find-scanner.o $(LIBSANEI) $(LIBLIB) -lscsi

depend:
makedepend $(INCLUDES) *.c
*** sanei/sanei_ab306.c 1998/03/01 18:24:08 1.1
--- sanei/sanei_ab306.c 1998/03/01 18:32:30
***************
*** 51,57 ****
# include <sys/io.h> /* use where available (glibc 2.x, for example) */
#elif HAVE_ASM_IO_H
# include <asm/io.h> /* ugly, but backwards compatible */
! #elif defined (__i386__) && defined (__GNUC__)

static __inline__ void
outb (u_char value, u_long port)
--- 51,57 ----
# include <sys/io.h> /* use where available (glibc 2.x, for example) */
#elif HAVE_ASM_IO_H
# include <asm/io.h> /* ugly, but backwards compatible */
! #elif defined (__i386__) && defined (__GNUC__) && !defined(__FreeBSD__)

static __inline__ void
outb (u_char value, u_long port)
*** dmc.c 1998/03/02 16:49:56 1.1
--- dmc.c 1998/03/02 16:50:10
***************
*** 397,406 ****
return SANE_STATUS_INVAL;
}
c->imageMode = mode;
! c->val[OPT_TL_X] = c->tl_x_range.min;
! c->val[OPT_TL_Y] = c->tl_y_range.min;
! c->val[OPT_BR_X] = c->br_x_range.min;
! c->val[OPT_BR_Y] = c->br_y_range.min;
return SANE_STATUS_GOOD;
}

--- 397,406 ----
return SANE_STATUS_INVAL;
}
c->imageMode = mode;
! c->val[OPT_TL_X].w = c->tl_x_range.min;
! c->val[OPT_TL_Y].w = c->tl_y_range.min;
! c->val[OPT_BR_X].w = c->br_x_range.min;
! c->val[OPT_BR_Y].w = c->br_y_range.min;
return SANE_STATUS_GOOD;
}

-- 
Kaz Sasayama <Kaz.Sasayama@hypercore.co.jp>
Hypercore Software Design, Ltd. <URL:http://www.hypercore.co.jp/>



--
Source code, list archive, and docs: http://www.mostang.com/sane/
To unsubscribe: echo unsubscribe sane-devel | mail majordomo@mostang.com