kopia lustrzana https://gitlab.com/sane-project/backends
Merge branch 'macfixes' into 'master'
Mac fixes See merge request sane-project/backends!821merge-requests/569/merge
commit
dcf4241470
12
acinclude.m4
12
acinclude.m4
|
@ -248,8 +248,16 @@ AC_DEFUN([SANE_CHECK_PTHREAD],
|
||||||
AC_DEFINE(PTHREAD_T_IS_INTEGER, 1,
|
AC_DEFINE(PTHREAD_T_IS_INTEGER, 1,
|
||||||
[Define if pthread_t is integer.])
|
[Define if pthread_t is integer.])
|
||||||
else
|
else
|
||||||
# Until the sanei_thread implementation is fixed.
|
case "$host_os" in
|
||||||
use_pthread=no
|
darwin*)
|
||||||
|
# Always use pthreads on macOS
|
||||||
|
use_pthread=yes
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
# Until the sanei_thread implementation is fixed.
|
||||||
|
use_pthread=no
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$have_pthread" = "yes" ; then
|
if test "$have_pthread" = "yes" ; then
|
||||||
|
|
|
@ -62,13 +62,6 @@
|
||||||
# define UNUSED(v)
|
# define UNUSED(v)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* MAC OS X does not support timeouts in darwin/libusb interrupt reads
|
|
||||||
* This is a very basic turnaround for MAC OS X
|
|
||||||
* Button scan will not work with this wrapper */
|
|
||||||
#ifdef __APPLE__
|
|
||||||
# define sanei_usb_read_int sanei_usb_read_bulk
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
struct pixma_io_t
|
struct pixma_io_t
|
||||||
{
|
{
|
||||||
|
|
Ładowanie…
Reference in New Issue