Update upstream source from tag 'upstream/1.0.28'

Update to upstream version '1.0.28' with Debian dir ec5bb298266630fc3801ff6dc0c258f6df7ba979
author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2019-07-31 17:00:20 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2019-07-31 17:00:20 +0200
commit: 3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (patch)
tree: d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /include
parent: c8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent: 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f (diff)
26 files changed, 163 insertions, 1434 deletions
diff --git a/include/.gitignore b/include/.gitignore
new file mode 100644
index 0000000..fb772cb
--- /dev/null
+++ b/include/.gitignore
@@ -0,0 +1,2 @@
+_stdint.h
+byteorder.h
diff --git a/include/Makefile.in b/include/Makefile.in
deleted file mode 100644
index 3ccbdf3..0000000
--- a/include/Makefile.in
+++ /dev/null
@@ -1,642 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = include
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/mkinstalldirs $(nobase_include_HEADERS)
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/byteorder.m4 $(top_srcdir)/m4/stdint.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/include/sane/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(includedir)"
-HEADERS = $(nobase_include_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
-AM_CPPFLAGS = @AM_CPPFLAGS@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = @AM_LDFLAGS@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AVAHI_CFLAGS = @AVAHI_CFLAGS@
-AVAHI_LIBS = @AVAHI_LIBS@
-AWK = @AWK@
-BACKENDS = @BACKENDS@
-BACKEND_CONFS_ENABLED = @BACKEND_CONFS_ENABLED@
-BACKEND_LIBS_ENABLED = @BACKEND_LIBS_ENABLED@
-BACKEND_MANS_ENABLED = @BACKEND_MANS_ENABLED@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLH = @DLH@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-DVIPS = @DVIPS@
-DYNAMIC_FLAG = @DYNAMIC_FLAG@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FIG2DEV = @FIG2DEV@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GPHOTO2_CPPFLAGS = @GPHOTO2_CPPFLAGS@
-GPHOTO2_LDFLAGS = @GPHOTO2_LDFLAGS@
-GPHOTO2_LIBS = @GPHOTO2_LIBS@
-GREP = @GREP@
-GS = @GS@
-HAVE_GPHOTO2 = @HAVE_GPHOTO2@
-IEEE1284_LIBS = @IEEE1284_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LOCKPATH = @INSTALL_LOCKPATH@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-JPEG_LIBS = @JPEG_LIBS@
-LATEX = @LATEX@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBV4L_CFLAGS = @LIBV4L_CFLAGS@
-LIBV4L_LIBS = @LIBV4L_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCKPATH_GROUP = @LOCKPATH_GROUP@
-LTALLOCA = @LTALLOCA@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINDEX = @MAKEINDEX@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATH_LIB = @MATH_LIB@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PDFLATEX = @PDFLATEX@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PNG_LIBS = @PNG_LIBS@
-POSUB = @POSUB@
-PPMTOGIF = @PPMTOGIF@
-PRELOADABLE_BACKENDS = @PRELOADABLE_BACKENDS@
-PRELOADABLE_BACKENDS_ENABLED = @PRELOADABLE_BACKENDS_ENABLED@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-RANLIB = @RANLIB@
-RESMGR_LIBS = @RESMGR_LIBS@
-SANEI_SANEI_JPEG_LO = @SANEI_SANEI_JPEG_LO@
-SANE_CONFIG_PATH = @SANE_CONFIG_PATH@
-SCSI_LIBS = @SCSI_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SNMP_CFLAGS = @SNMP_CFLAGS@
-SNMP_CONFIG_PATH = @SNMP_CONFIG_PATH@
-SNMP_LIBS = @SNMP_LIBS@
-SOCKET_LIBS = @SOCKET_LIBS@
-STRICT_LDFLAGS = @STRICT_LDFLAGS@
-STRIP = @STRIP@
-SYSLOG_LIBS = @SYSLOG_LIBS@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
-TIFF_LIBS = @TIFF_LIBS@
-USB_CFLAGS = @USB_CFLAGS@
-USB_LIBS = @USB_LIBS@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-V_MAJOR = @V_MAJOR@
-V_MINOR = @V_MINOR@
-V_REV = @V_REV@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-configdir = @configdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-effective_target = @effective_target@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-locksanedir = @locksanedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-nobase_include_HEADERS = sane/sane.h sane/saneopts.h
-EXTRA_DIST = lalloca.h lassert.h lgetopt.h md5.h font_6x11.h \
-	sane/config.h.in sane/sanei.h sane/sanei_ab306.h \
-	sane/sanei_access.h sane/sanei_auth.h sane/sanei_backend.h \
-	sane/sanei_cderror.h sane/sanei_codec_ascii.h \
-	sane/sanei_codec_bin.h sane/sanei_config.h sane/sanei_debug.h \
-	sane/sanei_jinclude.h sane/sanei_jpeg.h sane/sanei_lm983x.h \
-	sane/sanei_net.h sane/sanei_pa4s2.h sane/sanei_pio.h \
-	sane/sanei_pp.h sane/sanei_pv8630.h sane/sanei_scsi.h \
-	sane/sanei_tcp.h sane/sanei_thread.h sane/sanei_udp.h \
-	sane/sanei_usb.h sane/sanei_wire.h sane/sanei_magic.h \
-	sane/sanei_ir.h
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu include/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-	fi; \
-	$(am__nobase_list) | while read dir files; do \
-	  xfiles=; for file in $$files; do \
-	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-	  test -z "$$xfiles" || { \
-	    test "x$$dir" = x. || { \
-	      echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
-	      $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
-	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
-	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
-	done
-
-uninstall-nobase_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-nobase_includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-nobase_includeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man \
-	install-nobase_includeHEADERS install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-nobase_includeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/include/lalloca.h b/include/lalloca.h
index 85e4ea8..214e550 100644
--- a/include/lalloca.h
+++ b/include/lalloca.h
@@ -37,8 +37,8 @@
    whether to permit this exception to apply to your modifications.
    If you do not wish that, delete this exception notice.
 
-   Choose suitable implementation of alloca. 
-   
+   Choose suitable implementation of alloca.
+
 */
 
 #ifndef lalloca_h
diff --git a/include/lassert.h b/include/lassert.h
index 4d1c740..5a86e21 100644
--- a/include/lassert.h
+++ b/include/lassert.h
@@ -48,7 +48,7 @@
 /* The idea is from the gcc header file assert.h. */
 
 #if defined __GNUC__ && defined _AIX
-/* The implementation of assert of gcc on AIX is in libgcc.a. This 
+/* The implementation of assert of gcc on AIX is in libgcc.a. This
    doesn't work with shared libraries. So let's make our own assert(). */
 #define assert(arg)  \
  ((void) ((arg) ? 0 : lassert (arg, __FILE__, __LINE__)))
diff --git a/include/md5.h b/include/md5.h
index 51e2512..bee44f6 100644
--- a/include/md5.h
+++ b/include/md5.h
@@ -87,7 +87,7 @@ typedef unsigned long int md5_uintptr;
 #define ALIGN __attribute__ ((__aligned__ (4)))
 #else
 #define ALIGN
-#endif 
+#endif
 
 /* Structure to save state of computation between the single steps.  */
 struct md5_ctx
diff --git a/include/sane/.gitignore b/include/sane/.gitignore
new file mode 100644
index 0000000..f282c15
--- /dev/null
+++ b/include/sane/.gitignore
@@ -0,0 +1,3 @@
+config.h.in
+config.h
+stamp-h1
diff --git a/include/sane/config.h.in b/include/sane/config.h.in
deleted file mode 100644
index 9a90a8d..0000000
--- a/include/sane/config.h.in
+++ /dev/null
@@ -1,711 +0,0 @@
-/* include/sane/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if the system supports IPv6 */
-#undef ENABLE_IPV6
-
-/* Define to 1 if device locking should be enabled. */
-#undef ENABLE_LOCKING
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#undef ENABLE_NLS
-
-/* Define if GPLogFunc does not take a va_list. */
-#undef GPLOGFUNC_NO_VARGS
-
-/* Define to 1 if struct sockaddr_storage has an ss_family member */
-#undef HAS_SS_FAMILY
-
-/* Define to 1 if struct sockaddr_storage has __ss_family instead of ss_family
-   */
-#undef HAS___SS_FAMILY
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <apollo/scsi.h> header file. */
-#undef HAVE_APOLLO_SCSI_H
-
-/* Define to 1 if you have the <asm/io.h> header file. */
-#undef HAVE_ASM_IO_H
-
-/* Define to 1 if you have the <asm/types.h> header file. */
-#undef HAVE_ASM_TYPES_H
-
-/* Define to 1 if you have the `atexit' function. */
-#undef HAVE_ATEXIT
-
-/* Define to 1 if you have the <be/kernel/OS.h> header file. */
-#undef HAVE_BE_KERNEL_OS_H
-
-/* Define to 1 if you have the <bsd/dev/scsireg.h> header file. */
-#undef HAVE_BSD_DEV_SCSIREG_H
-
-/* Define to 1 if you have the <camlib.h> header file. */
-#undef HAVE_CAMLIB_H
-
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the `cfmakeraw' function. */
-#undef HAVE_CFMAKERAW
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#undef HAVE_DCGETTEXT
-
-/* Define to 1 if you have the <ddk/ntddscsi.h> header file. */
-#undef HAVE_DDK_NTDDSCSI_H
-
-/* Define to 1 if you have the <dev/ppbus/ppi.h> header file. */
-#undef HAVE_DEV_PPBUS_PPI_H
-
-/* Is /dev/urandom available? */
-#undef HAVE_DEV_URANDOM
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the `dlopen' function. */
-#undef HAVE_DLOPEN
-
-/* Define to 1 if you have the <dl.h> header file. */
-#undef HAVE_DL_H
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `getaddrinfo' function. */
-#undef HAVE_GETADDRINFO
-
-/* Define to 1 if you have the `getenv' function. */
-#undef HAVE_GETENV
-
-/* Define to 1 if you have the `getnameinfo' function. */
-#undef HAVE_GETNAMEINFO
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
-/* Define to 1 if you have the `getopt_long' function. */
-#undef HAVE_GETOPT_LONG
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define to 1 if you have the `getpass' function. */
-#undef HAVE_GETPASS
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#undef HAVE_GETTEXT
-
-/* Define to 1 if you have the `getuid' function. */
-#undef HAVE_GETUID
-
-/* Define to 1 if you have the `gp_camera_init' function. */
-#undef HAVE_GP_CAMERA_INIT
-
-/* Define to 1 if you have the `gp_port_info_get_path' function. */
-#undef HAVE_GP_PORT_INFO_GET_PATH
-
-/* Define to 1 if you have the <gscdds.h> header file. */
-#undef HAVE_GSCDDS_H
-
-/* Define to 1 if you have the `i386_set_ioperm' function. */
-#undef HAVE_I386_SET_IOPERM
-
-/* Define if you have the iconv() function and it works. */
-#undef HAVE_ICONV
-
-/* Define to 1 if you have the <ifaddrs.h> header file. */
-#undef HAVE_IFADDRS_H
-
-/* Define to 1 if you have the `inet_addr' function. */
-#undef HAVE_INET_ADDR
-
-/* Define to 1 if you have the `inet_aton' function. */
-#undef HAVE_INET_ATON
-
-/* Define to 1 if you have the `inet_ntoa' function. */
-#undef HAVE_INET_NTOA
-
-/* Define to 1 if you have the `inet_ntop' function. */
-#undef HAVE_INET_NTOP
-
-/* Define to 1 if you have the `inet_pton' function. */
-#undef HAVE_INET_PTON
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <IOKit/cdb/IOSCSILib.h> header file. */
-#undef HAVE_IOKIT_CDB_IOSCSILIB_H
-
-/* Define to 1 if you have the
-   <IOKit/scsi-commands/SCSICommandOperationCodes.h> header file. */
-#undef HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H
-
-/* Define to 1 if you have the <IOKit/scsi/SCSICommandOperationCodes.h> header
-   file. */
-#undef HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H
-
-/* Define to 1 if you have the <IOKit/scsi/SCSITaskLib.h> header file. */
-#undef HAVE_IOKIT_SCSI_SCSITASKLIB_H
-
-/* Define to 1 if you have the `ioperm' function. */
-#undef HAVE_IOPERM
-
-/* Define to 1 if you have the `iopl' function. */
-#undef HAVE_IOPL
-
-/* Define to 1 if you have the <io/cam/cam.h> header file. */
-#undef HAVE_IO_CAM_CAM_H
-
-/* Define to 1 if you have the `isfdtype' function. */
-#undef HAVE_ISFDTYPE
-
-/* Define to 1 if you have the <libc.h> header file. */
-#undef HAVE_LIBC_H
-
-/* Define to 1 if you have the `ieee1284' library (-lcam). */
-#undef HAVE_LIBIEEE1284
-
-/* Define to 1 if you have the libjpeg library. */
-#undef HAVE_LIBJPEG
-
-/* Define to 1 if you have the libpng library. */
-#undef HAVE_LIBPNG
-
-/* Define to 1 if you have the net-snmp library. */
-#undef HAVE_LIBSNMP
-
-/* Define to 1 if you have libusb-1.0 */
-#undef HAVE_LIBUSB
-
-/* Define to 1 if you have libusb-0.1 */
-#undef HAVE_LIBUSB_LEGACY
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define to 1 if you have the <linux/ppdev.h> header file. */
-#undef HAVE_LINUX_PPDEV_H
-
-/* Define if the long long type is available. */
-#undef HAVE_LONG_LONG
-
-/* Define to 1 if you have the <lusb0_usb.h> header file. */
-#undef HAVE_LUSB0_USB_H
-
-/* Define to 1 if you have the <machine/cpufunc.h> header file. */
-#undef HAVE_MACHINE_CPUFUNC_H
-
-/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-#undef HAVE_MACH_O_DYLD_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mkdir' function. */
-#undef HAVE_MKDIR
-
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define to 1 if you have the `NSLinkModule' function. */
-#undef HAVE_NSLINKMODULE
-
-/* Define to 1 if you have the <ntddscsi.h> header file. */
-#undef HAVE_NTDDSCSI_H
-
-/* Define to 1 if you have the <os2.h> header file. */
-#undef HAVE_OS2_H
-
-/* Define to 1 if you have the `poll' function. */
-#undef HAVE_POLL
-
-/* Define to 1 if you have the `pthread_cancel' function. */
-#undef HAVE_PTHREAD_CANCEL
-
-/* Define to 1 if you have the `pthread_create' function. */
-#undef HAVE_PTHREAD_CREATE
-
-/* Define to 1 if you have the `pthread_detach' function. */
-#undef HAVE_PTHREAD_DETACH
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#undef HAVE_PTHREAD_H
-
-/* Define to 1 if you have the `pthread_join' function. */
-#undef HAVE_PTHREAD_JOIN
-
-/* Define to 1 if you have the `pthread_kill' function. */
-#undef HAVE_PTHREAD_KILL
-
-/* Define to 1 if you have the `pthread_testcancel' function. */
-#undef HAVE_PTHREAD_TESTCANCEL
-
-/* Define to 1 if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
-
-/* define if you have the resmgr library */
-#undef HAVE_RESMGR
-
-/* Define to 1 if you have the `scsireq_enter' function. */
-#undef HAVE_SCSIREQ_ENTER
-
-/* Define if SCSITaskSGElement is available. */
-#undef HAVE_SCSITASKSGELEMENT
-
-/* Define to 1 if you have the <scsi.h> header file. */
-#undef HAVE_SCSI_H
-
-/* Define to 1 if you have the <scsi/sg.h> header file. */
-#undef HAVE_SCSI_SG_H
-
-/* Define to 1 if you have the `setitimer' function. */
-#undef HAVE_SETITIMER
-
-/* Define if sg_header.target_status is available. */
-#undef HAVE_SG_TARGET_STATUS
-
-/* Define to 1 if you have the `shl_load' function. */
-#undef HAVE_SHL_LOAD
-
-/* Define to 1 if you have the `sigprocmask' function. */
-#undef HAVE_SIGPROCMASK
-
-/* Define to 1 if you have the `sleep' function. */
-#undef HAVE_SLEEP
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strcasestr' function. */
-#undef HAVE_STRCASESTR
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strftime' function. */
-#undef HAVE_STRFTIME
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#undef HAVE_STRNCASECMP
-
-/* Define to 1 if you have the `strndup' function. */
-#undef HAVE_STRNDUP
-
-/* Define to 1 if you have the `strsep' function. */
-#undef HAVE_STRSEP
-
-/* Define to 1 if you have the `strstr' function. */
-#undef HAVE_STRSTR
-
-/* Define to 1 if you have the `strtod' function. */
-#undef HAVE_STRTOD
-
-/* Define if struct flock is available. */
-#undef HAVE_STRUCT_FLOCK
-
-/* Define to 1 if you have the `syslog' function. */
-#undef HAVE_SYSLOG
-
-/* Is /usr/include/systemd/sd-daemon.h available? */
-#undef HAVE_SYSTEMD
-
-/* Define to 1 if you have the <sys/dsreq.h> header file. */
-#undef HAVE_SYS_DSREQ_H
-
-/* Define to 1 if you have the <sys/hw.h> header file. */
-#undef HAVE_SYS_HW_H
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/io.h> header file. */
-#undef HAVE_SYS_IO_H
-
-/* Define to 1 if you have the <sys/ipc.h> header file. */
-#undef HAVE_SYS_IPC_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/passthrudef.h> header file. */
-#undef HAVE_SYS_PASSTHRUDEF_H
-
-/* Define to 1 if you have the <sys/poll.h> header file. */
-#undef HAVE_SYS_POLL_H
-
-/* Define to 1 if you have the <sys/scanio.h> header file. */
-#undef HAVE_SYS_SCANIO_H
-
-/* Define to 1 if you have the <sys/scsicmd.h> header file. */
-#undef HAVE_SYS_SCSICMD_H
-
-/* Define to 1 if you have the <sys/scsiio.h> header file. */
-#undef HAVE_SYS_SCSIIO_H
-
-/* Define to 1 if you have the <sys/scsi.h> header file. */
-#undef HAVE_SYS_SCSI_H
-
-/* Define to 1 if you have the <sys/scsi/scsi.h> header file. */
-#undef HAVE_SYS_SCSI_SCSI_H
-
-/* Define to 1 if you have the <sys/scsi/sgdefs.h> header file. */
-#undef HAVE_SYS_SCSI_SGDEFS_H
-
-/* Define to 1 if you have the <sys/scsi/targets/scgio.h> header file. */
-#undef HAVE_SYS_SCSI_TARGETS_SCGIO_H
-
-/* Define to 1 if you have the <sys/sdi_comm.h> header file. */
-#undef HAVE_SYS_SDI_COMM_H
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define to 1 if you have the <sys/sem.h> header file. */
-#undef HAVE_SYS_SEM_H
-
-/* Define to 1 if you have the <sys/shm.h> header file. */
-#undef HAVE_SYS_SHM_H
-
-/* Define to 1 if you have the <sys/signal.h> header file. */
-#undef HAVE_SYS_SIGNAL_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the `tcsendbreak' function. */
-#undef HAVE_TCSENDBREAK
-
-/* Define to 1 if you have the <tiffio.h> header file. */
-#undef HAVE_TIFFIO_H
-
-/* Define if union semun is available. */
-#undef HAVE_UNION_SEMUN
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have usbcall.dll. */
-#undef HAVE_USBCALLS
-
-/* Define to 1 if you have the `usleep' function. */
-#undef HAVE_USLEEP
-
-/* Define to 1 if the system has the type `u_char'. */
-#undef HAVE_U_CHAR
-
-/* Define to 1 if the system has the type `u_int'. */
-#undef HAVE_U_INT
-
-/* Define to 1 if the system has the type `u_long'. */
-#undef HAVE_U_LONG
-
-/* Define to 1 if the system has the type `u_short'. */
-#undef HAVE_U_SHORT
-
-/* Define to 1 if you have the `vsyslog' function. */
-#undef HAVE_VSYSLOG
-
-/* Define to 1 if you have the <windows.h> header file. */
-#undef HAVE_WINDOWS_H
-
-/* Define to 1 if you have the <winsock2.h> header file. */
-#undef HAVE_WINSOCK2_H
-
-/* Define to 1 if you have the `_portaccess' function. */
-#undef HAVE__PORTACCESS
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* SANE DLL revision number */
-#undef SANE_DLL_V_BUILD
-
-/* SANE DLL major number */
-#undef SANE_DLL_V_MAJOR
-
-/* SANE DLL minor number */
-#undef SANE_DLL_V_MINOR
-
-/* Define to 1 if you have the <sys/io.h> providing inb,outb. */
-#undef SANE_HAVE_SYS_IO_H_WITH_INB_OUTB
-
-/* SCSI command buffer size */
-#undef SCSIBUFFERSIZE
-
-/* The size of `char', as computed by sizeof. */
-#undef SIZEOF_CHAR
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of `void*', as computed by sizeof. */
-#undef SIZEOF_VOIDP
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if pthreads should be used instead of forked processes. */
-#undef USE_PTHREAD
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Version number of package */
-#undef VERSION
-
-/* define if Avahi support is enabled for saned and the net backend */
-#undef WITH_AVAHI
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define scsireq_t as \'struct scsireq\' if necessary. */
-#undef scsireq_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/* Define socklen_t as \'int\' if necessary. */
-#undef socklen_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef ssize_t
-
-/* Define for OS/2 only */
-#undef strcasecmp
-
-/* Define for OS/2 only */
-#undef strncasecmp
-
-
-
-#if defined(__MINGW32__)
-#define _BSDTYPES_DEFINED
-#endif
-
-#ifndef HAVE_U_CHAR
-#define u_char unsigned char
-#endif
-#ifndef HAVE_U_SHORT
-#define u_short unsigned short
-#endif
-#ifndef HAVE_U_INT
-#define u_int unsigned int
-#endif
-#ifndef HAVE_U_LONG
-#define u_long unsigned long
-#endif
-
-/* Prototype for getenv */
-#ifndef HAVE_GETENV
-#define getenv sanei_getenv
-char * getenv(const char *name);
-#endif
-
-/* Prototype for inet_ntop */
-#ifndef HAVE_INET_NTOP
-#define inet_ntop sanei_inet_ntop
-#include <sys/types.h>
-const char * inet_ntop (int af, const void *src, char *dst, size_t cnt);
-#endif
-
-/* Prototype for inet_pton */
-#ifndef HAVE_INET_PTON
-#define inet_pton sanei_inet_pton
-int inet_pton (int af, const char *src, void *dst);
-#endif
-
-/* Prototype for isfdtype */
-#ifndef HAVE_ISFDTYPE
-#define isfdtype sanei_isfdtype
-int isfdtype(int fd, int fdtype);
-#endif
-
-/* Prototype for sigprocmask */
-#ifndef HAVE_SIGPROCMASK
-#define sigprocmask sanei_sigprocmask
-int sigprocmask (int how, int *new, int *old);
-#endif
-
-/* Prototype for snprintf */
-#ifndef HAVE_SNPRINTF
-#define snprintf sanei_snprintf
-#include <sys/types.h>
-int snprintf (char *str,size_t count,const char *fmt,...);
-#endif
-
-/* Prototype for strcasestr */
-#ifndef HAVE_STRCASESTR
-#define strcasestr sanei_strcasestr
-char * strcasestr (const char *phaystack, const char *pneedle);
-#endif
-
-/* Prototype for strdup */
-#ifndef HAVE_STRDUP
-#define strdup sanei_strdup
-char *strdup (const char * s);
-#endif
-
-/* Prototype for strndup */
-#ifndef HAVE_STRNDUP
-#define strndup sanei_strndup
-#include <sys/types.h>
-char *strndup(const char * s, size_t n);
-#endif
-
-/* Prototype for strsep */
-#ifndef HAVE_STRSEP
-#define strsep sanei_strsep
-char *strsep(char **stringp, const char *delim);
-#endif
-
-/* Prototype for usleep */
-#ifndef HAVE_USLEEP
-#define usleep sanei_usleep
-unsigned int usleep (unsigned int useconds);
-#endif
-
-/* Prototype for vsyslog */
-#ifndef HAVE_VSYSLOG
-#include <stdarg.h>
-void vsyslog(int priority, const char *format, va_list args);
-#endif
-
diff --git a/include/sane/sane.h b/include/sane/sane.h
index 5320b4a..9f8bc7c 100644
--- a/include/sane/sane.h
+++ b/include/sane/sane.h
@@ -242,7 +242,7 @@ extern SANE_String_Const sane_strstatus (SANE_Status status);
 
 #ifdef __cplusplus
 }
-#endif 
+#endif
 
 
 #endif /* sane_h */
diff --git a/include/sane/sanei.h b/include/sane/sanei.h
index 9458f34..aa7003a 100644
--- a/include/sane/sanei.h
+++ b/include/sane/sanei.h
@@ -20,24 +20,24 @@
 
    As a special exception, the authors of SANE give permission for
    additional uses of the libraries contained in this release of SANE.
-   
+
    The exception is that, if you link a SANE library with other files
    to produce an executable, this does not by itself cause the
    resulting executable to be covered by the GNU General Public
    License.  Your use of that executable is in no way restricted on
    account of linking the SANE library code into it.
-   
+
    This exception does not, however, invalidate any other reasons why
    the executable file might be covered by the GNU General Public
    License.
-   
+
    If you submit changes to SANE to the maintainers to be included in
    a subsequent release, you agree by submitting the changes that
    those changes may be distributed with this exception intact.
-   
+
    If you write modifications of your own for SANE, it is your choice
    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.
 */
 
 /** @file sanei.h
@@ -58,14 +58,14 @@
  * to be platform-independent to avoid lots of \#ifdef code in the backends.
  * Please use the SANEI functions wherever possible.
  *
- * This documentation was created by the use of doxygen, the 
+ * This documentation was created by the use of doxygen, the
  * doc/doxygen-sanei.conf configuration file and documentation in the sanei_*.h
  * files.
  *
  * This documentation is far from complete. Any help is appreciated.
  *
  * @section additional Additional documentation
- * - The SANE standard can be found at <a 
+ * - The SANE standard can be found at <a
  *   href="http://www.sane-project.org/html/">the SANE webserver</a>,
  *   though the PostScript version produced from the source may be more recent.
  * - Information on how to write a backend: <a
@@ -73,15 +73,15 @@
  * - General SANE documentation is on <a
  *   href="http://www.sane-project.org/docs.html">the SANE documentation
  *   page</a>.
- * 
- * @section contact Contact 
+ *
+ * @section contact Contact
  *
  * The common way to contact the developers of SANE is the sane-devel
  * mailing list. See the <a
  * href="http://www.sane-project.org/mailing-lists.html">mailing list webpage</a>
  * for details. That's the place to ask questions, report bugs, or announce
  * a new backend.
- * 
+ *
  */
 
 #ifndef sanei_h
@@ -89,6 +89,10 @@
 
 #include <sane/sane.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** @name Public macros and functions
  * @{
  */
@@ -113,7 +117,7 @@
  * @param opt   option to check
  * @param value value of the option
  *
- * @return 
+ * @return
  * - SANE_STATUS_GOOD     - on success
  * - SANE_STATUS_INVAL    - if the value doesn't fit inside the constraint
  *   or any other error occured
@@ -130,7 +134,7 @@
  * @param value value of the option
  * @param info  info is set to SANE_INFO_INEXACT if value was changed
  *
- * @return 
+ * @return
  * - SANE_STATUS_GOOD     - on success
  * - SANE_STATUS_INVAL    - if the function wasn't able to fit value into the
  *   constraint or any other error occured
@@ -167,5 +171,8 @@ extern SANE_Status sanei_check_value (const SANE_Option_Descriptor * opt,
 extern SANE_Status sanei_constrain_value (const SANE_Option_Descriptor * opt,
 					  void * value, SANE_Word * info);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
 #endif /* sanei_h */
diff --git a/include/sane/sanei_access.h b/include/sane/sanei_access.h
index d668b98..0f73f5f 100644
--- a/include/sane/sanei_access.h
+++ b/include/sane/sanei_access.h
@@ -46,7 +46,7 @@
  *  Interface file for the sanei_access functions.
  *
  *  The idea is to provide some simple locking/unlocking mecanism, which
- *  can be used to protect device access from more than one frontend 
+ *  can be used to protect device access from more than one frontend
  *  simultaneously.
  */
 
@@ -66,7 +66,7 @@ extern void sanei_access_init( const char * backend );
 
 /** Set a lock.
  *
- * The function tries to open/create exclusively a lock file in 
+ * The function tries to open/create exclusively a lock file in
  * $PATH_SANE_LOCK_DIR.
  * If the file could be created successfully, the function fills in the
  * process ID.
@@ -77,7 +77,7 @@ extern void sanei_access_init( const char * backend );
  *
  * @param devicename - unique part of the lockfile name
  * @param timeout    - time in seconds to try to set a lock
- * @return  
+ * @return
  * - SANE_STATUS_GOOD          - if the lock has been successfully set
  * - SANE_STATUS_ACCESS_DENIED - the lock could not set
  */
diff --git a/include/sane/sanei_auth.h b/include/sane/sanei_auth.h
index 1fd240d..37c8d1f 100644
--- a/include/sane/sanei_auth.h
+++ b/include/sane/sanei_auth.h
@@ -36,7 +36,7 @@
 
    If you write modifications of your own for SANE, it is your choice
    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.
 */
 
 /** @file sanei_auth.h
@@ -67,9 +67,9 @@
  * If the requested resource isn't listed in this file, sanei_authorize
  * return SANE_SATUS_GOOD. In all other cases, sanei_authorize sends a
  * challenge to the frontend of the form
- * 
+ *
  * resource$MD5$randomstring
- * 
+ *
  * where randomstring consists of the PID, the time, and some random
  * characters. It accepts two forms of answers
  *
@@ -77,7 +77,7 @@
  * md5: username:$MD5$m5digest
  *
  * where md5digest is md5(randomstring password).
- * 
+ *
  * If this username/password/resource triple is listed in backend.users
  * sanei_authorize returns SANE_STATUS_GOOD, in all other cases it returns
  * SANE_STATUS_ACCESS_DENIED.
diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h
index 8273e88..32d8ce0 100644
--- a/include/sane/sanei_backend.h
+++ b/include/sane/sanei_backend.h
@@ -113,6 +113,10 @@
 /** @name Declaration of entry points:
  * @{
  */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern SANE_Status ENTRY(init) (SANE_Int *, SANE_Auth_Callback);
 extern SANE_Status ENTRY(get_devices) (const SANE_Device ***, SANE_Bool);
 extern SANE_Status ENTRY(open) (SANE_String_Const, SANE_Handle *);
@@ -130,6 +134,10 @@ extern void ENTRY(cancel) (SANE_Handle);
 extern void ENTRY(close) (SANE_Handle);
 extern void ENTRY(exit) (void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #ifndef STUBS
 /* Now redirect sane_* calls to backend's functions: */
 
@@ -152,7 +160,7 @@ extern void ENTRY(exit) (void);
 /** Internationalization for SANE backends
  *
  * Add SANE_I18N() to all texts that can be translated.
- * E.g. out_txt = SANE_I18N("Hello"); 
+ * E.g. out_txt = SANE_I18N("Hello");
  */
 #ifndef SANE_I18N
 #define SANE_I18N(text) text
diff --git a/include/sane/sanei_config.h b/include/sane/sanei_config.h
index cf877cf..3a60167 100644
--- a/include/sane/sanei_config.h
+++ b/include/sane/sanei_config.h
@@ -52,8 +52,12 @@
 #include <stdio.h>
 #include <sane/sane.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** Search configuration file \a name along directory list and return file
- * pointer if such a file exists.  
+ * pointer if such a file exists.
  *
  * The following directory list is used:
  *	1st: SANE_CONFIG_DIR environment variable.
@@ -127,9 +131,9 @@ extern void sanei_config_attach_matching_devices (const char *name,
 						  (const char *dev));
 
 /** this structure holds the description of configuration options. There is
- * a list for options and another for their values. 
+ * a list for options and another for their values.
  * These lists are used when the configuration file is
- * parsed. Read values are stored in Option_Value. Helpers functions are 
+ * parsed. Read values are stored in Option_Value. Helpers functions are
  * provided to access values easily */
 typedef struct
 {
@@ -172,4 +176,8 @@ extern SANE_Status sanei_configure_attach (
  */
 extern const char *sanei_config_get_paths (void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif	/* sanei_config_h */
diff --git a/include/sane/sanei_debug.h b/include/sane/sanei_debug.h
index 557f8a7..465d3e2 100644
--- a/include/sane/sanei_debug.h
+++ b/include/sane/sanei_debug.h
@@ -9,6 +9,10 @@
 
 #include <sane/sanei.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** @name Public macros
  * These macros can be used in backends and other SANE-related
  * code.
@@ -16,14 +20,14 @@
  * Before including sanei_debug.h, the following macros must be set:
  *
  * - BACKEND_NAME - The name of your backend without double-quotes (must be set in any case)
- * - STUBS - If this is defined, no macros will be included. Used in 
+ * - STUBS - If this is defined, no macros will be included. Used in
  *   backends consisting of more than one .c file.
- * - DEBUG_DECLARE_ONLY - Generates prototypes instead of functions. Used in 
+ * - DEBUG_DECLARE_ONLY - Generates prototypes instead of functions. Used in
  *   backends consisting of more than one .c file.
  * - DEBUG_NOT_STATIC - Doesn't generate static functions. Used in header files if
  *   they are include in more than one .c file.
  *
- * @{ 
+ * @{
  */
 
 /** @def DBG_INIT()
@@ -44,7 +48,7 @@
 /** @def IF_DBG(x)
  * Compile code only if debugging is enabled.
  *
- * Expands to x if debug support is enabled at compile-time. If NDEBUG is 
+ * Expands to x if debug support is enabled at compile-time. If NDEBUG is
  * defined at compile-time this macro expands to nothing.
  *
  * @param x code to expand when debugging is enabled
@@ -52,7 +56,7 @@
 
 /**
  * @def DBG_LEVEL
- * Current debug level. 
+ * Current debug level.
  *
  * You can only read this "variable".
  */
@@ -70,16 +74,16 @@
 #define ENTRY(name)     PASTE(PASTE(PASTE(sane_,BACKEND_NAME),_),name)
 
 #ifdef NDEBUG
-  
+
 extern void sanei_debug_ndebug (int level, const char *msg, ...);
-	
+
 # define DBG_LEVEL	(0)
 # define DBG_INIT()
 # define DBG		sanei_debug_ndebug
 # define IF_DBG(x)
-	
+
 #else /* !NDEBUG */
-	
+
                                   /** @hideinitializer*/
 # define DBG_LEVEL      PASTE(sanei_debug_,BACKEND_NAME)
 
@@ -103,7 +107,7 @@ int DBG_LEVEL = 0;
 
 #  ifdef DEBUG_DECLARE_ONLY
 
-extern void DBG_LOCAL (int level, const char *msg, ...) 
+extern void DBG_LOCAL (int level, const char *msg, ...)
 #ifdef __GNUC__
 __attribute__ ((format (printf, 2, 3)))
 #endif
@@ -112,8 +116,8 @@ __attribute__ ((format (printf, 2, 3)))
 #  else /* !DEBUG_DECLARE_ONLY */
 
 #   include <stdarg.h>
-	
-extern void sanei_debug_msg 
+
+extern void sanei_debug_msg
   (int level, int max_level, const char *be, const char *fmt, va_list ap);
 
 #ifdef __GNUC__
@@ -144,10 +148,14 @@ DBG_LOCAL (int level, const char *msg, ...)
 # define DBG            DBG_LOCAL
 
 extern void sanei_init_debug (const char * backend, int * debug_level_var);
-  
+
                                   /** @hideinitializer*/
 # define IF_DBG(x)      x
 
 #endif /* NDEBUG */
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* _SANEI_DEBUG_H */
diff --git a/include/sane/sanei_ir.h b/include/sane/sanei_ir.h
index aaca524..bbfd6d5 100644
--- a/include/sane/sanei_ir.h
+++ b/include/sane/sanei_ir.h
@@ -184,7 +184,7 @@ sanei_ir_to_8bit (SANE_Parameters * params, const SANE_Uint *in_img,
 /**
  * @brief Allocate and initialize logarithmic lookup table
  *
- * @param[in]  length of table, usually 1 << depth
+ * @param[in]  len length of table, usually 1 << depth
  * @param[out] lut_ln adress of pointer to allocated table
  *
  * @return
@@ -202,7 +202,7 @@ SANE_Status sanei_ir_ln_table (int len, double **lut_ln);
  * @param[in]  lut_ln pointer lookup table
  *             if NULL it is dynamically handled
  * @param[in]  red_data pointer to red image plane
- * @param      ired_data pointer to ired image plane
+ * @param      ir_data pointer to ir image plane
  *
  * @return
  * - SANE_STATUS_GOOD - success
diff --git a/include/sane/sanei_lm983x.h b/include/sane/sanei_lm983x.h
index 6b9d8c8..8b48e65 100644
--- a/include/sane/sanei_lm983x.h
+++ b/include/sane/sanei_lm983x.h
@@ -4,7 +4,7 @@
    Copyright (C) 2002-2003 Gerhard Jaeger <gerhard@gjaeger.de>
 
    This file is part of the SANE package.
- 
+
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of the
@@ -140,11 +140,10 @@ extern SANE_Status sanei_lm983x_read( SANE_Int fd, SANE_Byte reg,
  * Reset the LM983x chip.
  *
  * @param fd    - device file descriptor
- * @return 
+ * @return
  * - SANE_TRUE  - reset successfuly done
  * - SANE_FALSE - reset failed
  */
 extern SANE_Bool sanei_lm983x_reset( SANE_Int fd );
 
 #endif /* sanei_lm983x_h */
-
diff --git a/include/sane/sanei_magic.h b/include/sane/sanei_magic.h
index ab704a8..297becd 100644
--- a/include/sane/sanei_magic.h
+++ b/include/sane/sanei_magic.h
@@ -1,5 +1,5 @@
 /* sane - Scanner Access Now Easy.
- 
+
    Copyright (C) 2009 m. allan noah
 
    This file is part of the SANE package.
@@ -57,6 +57,10 @@
 #ifndef SANEI_MAGIC_H
 #define SANEI_MAGIC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** Initialize sanei_magic.
  *
  * Call this before any other sanei_magic function.
@@ -141,7 +145,7 @@ sanei_magic_findEdges(SANE_Parameters * params, SANE_Byte * buffer,
  * @param buffer contains image data
  * @param top vertical offset to upper edge of crop
  * @param bot vertical offset to lower edge of crop
- * @param left horizontal offset to left edge of crop 
+ * @param left horizontal offset to left edge of crop
  * @param right horizontal offset to right edge of crop
  *
  * @return
@@ -219,4 +223,8 @@ extern SANE_Status
 sanei_magic_turn(SANE_Parameters * params, SANE_Byte * buffer,
   int angle);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* SANEI_MAGIC_H */
diff --git a/include/sane/sanei_pa4s2.h b/include/sane/sanei_pa4s2.h
index c5394a8..7138ceb 100644
--- a/include/sane/sanei_pa4s2.h
+++ b/include/sane/sanei_pa4s2.h
@@ -36,11 +36,11 @@
 
    If you write modifications of your own for SANE, it is your choice
    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.
 */
 
 /** @file sanei_pa4s2.h
- * This file implements an interface for the Mustek PP chipset A4S2 
+ * This file implements an interface for the Mustek PP chipset A4S2
  *
  * @sa sanei_usb.h, sanei_ab306.h, sanei_lm983x.h, sanei_scsi.h, sanei_pio.h
  */
@@ -72,39 +72,39 @@
  */
 extern const char ** sanei_pa4s2_devices(void);
 
-/** Open pa4s2 device 
+/** Open pa4s2 device
  *
  * Opens *dev as pa4s2 device.
  *
  * @param dev IO port address ("0x378", "0x278", or "0x3BC")
  * @param fd file descriptor
- * 
- * @return 
+ *
+ * @return
  * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_INVAL - if no scanner was found or the port number was wrong
  * - SANE_STATUS_DEVICE_BUSY - if the device is already in use
  * - SANE_STATUS_IO_ERROR - if the port couldn't be accessed
- * 
+ *
  */
 extern SANE_Status sanei_pa4s2_open (const char *dev, int *fd);
 
-/** Open pa4s2 SCSI-over-parallel device 
+/** Open pa4s2 SCSI-over-parallel device
  *
  * Opens *dev as pa4s2 SCSI-over-parallel device.
  *
  * @param dev IO port address ("0x378", "0x278", or "0x3BC")
  * @param fd file descriptor
- * 
- * @return 
+ *
+ * @return
  * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_INVAL - if no scanner was found or the port number was wrong
  * - SANE_STATUS_DEVICE_BUSY - if the device is already in use
  * - SANE_STATUS_IO_ERROR - if the port couldn't be accessed
- * 
+ *
  */
 extern SANE_Status sanei_pa4s2_scsi_pp_open (const char *dev, int *fd);
 
-/** Close pa4s2 device 
+/** Close pa4s2 device
  *
  * @param fd file descriptor
  */
@@ -175,7 +175,7 @@ extern SANE_Status sanei_pa4s2_scsi_pp_get_status (int fd, u_char *status);
  */
 extern SANE_Status sanei_pa4s2_scsi_pp_reg_select (int fd, int reg);
 
-/** Read a register 
+/** Read a register
  *
  * The function to read a register is split up in three parts, so a register
  * can be read more than once.
@@ -191,7 +191,7 @@ extern SANE_Status sanei_pa4s2_scsi_pp_reg_select (int fd, int reg);
  */
 extern SANE_Status sanei_pa4s2_readbyte (int fd, u_char * val);
 
-/** Terminate reading sequence 
+/** Terminate reading sequence
  *
  * The function to read a register is split up in three parts, so a register
  * can be read more than once.
diff --git a/include/sane/sanei_pio.h b/include/sane/sanei_pio.h
index 61ac414..afdfa26 100644
--- a/include/sane/sanei_pio.h
+++ b/include/sane/sanei_pio.h
@@ -52,4 +52,3 @@ extern int		sanei_pio_read  (int fd, u_char * buf, int n);
 extern int		sanei_pio_write (int fd, const u_char * buf, int n);
 
 #endif /* sanei_pio_h */
-
diff --git a/include/sane/sanei_pp.h b/include/sane/sanei_pp.h
index d3e7b92..902fcfa 100644
--- a/include/sane/sanei_pp.h
+++ b/include/sane/sanei_pp.h
@@ -36,7 +36,7 @@
 
    If you write modifications of your own for SANE, it is your choice
    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.
 */
 
 /** @file sanei_pp.h
@@ -78,7 +78,7 @@ enum sanei_pp_mode {
  */
 extern SANE_Status sanei_pp_init( void );
 
-/** Open a parport device. 
+/** Open a parport device.
  *
  * @param dev - name of device to open.
  * @param fd  - pointer to variable that should revceive the handle.
@@ -95,7 +95,7 @@ extern void sanei_pp_close( int fd );
 /** Claim a parport device
  *
  * @param fd - handle of the device to claim
- * @return 
+ * @return
  */
 extern SANE_Status sanei_pp_claim( int fd );
 
diff --git a/include/sane/sanei_pv8630.h b/include/sane/sanei_pv8630.h
index ef7e9dd..d69a024 100644
--- a/include/sane/sanei_pv8630.h
+++ b/include/sane/sanei_pv8630.h
@@ -5,7 +5,7 @@
    Copyright (C) 2001 Marcio Teixeira
 
    This file is part of the SANE package.
- 
+
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
    published by the Free Software Foundation; either version 2 of the
diff --git a/include/sane/sanei_scsi.h b/include/sane/sanei_scsi.h
index d69fd0f..fa6e5d1 100644
--- a/include/sane/sanei_scsi.h
+++ b/include/sane/sanei_scsi.h
@@ -39,7 +39,7 @@
 */
 
 /** @file sanei_scsi.h
- *  Generic interface to SCSI drivers.  
+ *  Generic interface to SCSI drivers.
  *  @sa sanei_usb.h, sanei_ab306.h,sanei_lm983x.h, sanei_pa4s2.h, sanei_pio.h,
  *  and man sane-scsi(5) for user-oriented documentation
  */
@@ -76,8 +76,8 @@ extern int sanei_scsi_max_request_size;
  *
  * Find each SCSI device that matches the pattern specified by the
  * arguments.  String arguments can be "omitted" by passing NULL,
- * integer arguments can be "omitted" by passing -1.  
- * 
+ * integer arguments can be "omitted" by passing -1.
+ *
  *   Example: vendor="HP" model=NULL, type=NULL, bus=3, id=-1, lun=-1 would
  *	    attach all HP devices on SCSI bus 3.
  *
@@ -100,15 +100,15 @@ extern void sanei_scsi_find_devices (const char *vendor, const char *model,
 /** Open a SCSI device
  *
  * Opens a SCSI device by its device filename and returns a file descriptor.
- * If it's necessary to adjust the SCSI buffer size, use 
+ * If it's necessary to adjust the SCSI buffer size, use
  * sanei_scsi_open_extended().
  *
  * @param device_name name of the devicefile, e.g. "/dev/sg0"
  * @param fd file descriptor
  * @param sense_handler called whenever the SCSI driver returns a sense buffer
  * @param sense_arg pointer to data for the sense handler
- * 
- * @return 
+ *
+ * @return
  * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_ACCESS_DENIED - if the file couldn't be accessed due to
  *   permissions
@@ -138,8 +138,8 @@ extern SANE_Status sanei_scsi_open (const char * device_name, int * fd,
  * @param sense_handler called whenever the SCSI driver returns a sense buffer
  * @param sense_arg pointer to data for the sense handler
  * @param buffersize size of the SCAI request buffer (in bytes)
- * 
- * @return 
+ *
+ * @return
  * - SANE_STATUS_GOOD - on success
  * - SANE_STATUS_ACCESS_DENIED - if the file couldn't be accessed due to
  *   permissions
@@ -195,7 +195,7 @@ extern SANE_Status sanei_scsi_req_enter (int fd,
 					 void * dst, size_t * dst_size,
 					 void **idp);
 
-/** Enqueue SCSI command and separated data 
+/** Enqueue SCSI command and separated data
  *
  * Same as sanei_scsi_req_enter(), but with separate buffers for the SCSI
  * command and for the data to be sent to the device.
@@ -235,7 +235,7 @@ extern SANE_Status sanei_scsi_req_enter2 (int fd,
 
 /** Wait for SCSI command
  *
- * Wait for the completion of the SCSI command with id ID.  
+ * Wait for the completion of the SCSI command with id ID.
  *
  * @param id id used in sanei_scsi_req_enter()
  *
diff --git a/include/sane/sanei_tcp.h b/include/sane/sanei_tcp.h
index 0c3aeb4..227e613 100644
--- a/include/sane/sanei_tcp.h
+++ b/include/sane/sanei_tcp.h
@@ -12,7 +12,7 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Header file for TCP/IP communications. 
+ * Header file for TCP/IP communications.
  */
 
 #ifndef sanei_tcp_h
diff --git a/include/sane/sanei_thread.h b/include/sane/sanei_thread.h
index fa72481..6e68964 100644
--- a/include/sane/sanei_thread.h
+++ b/include/sane/sanei_thread.h
@@ -94,6 +94,38 @@ extern SANE_Bool sanei_thread_is_forked (void);
  */
 extern SANE_Bool sanei_thread_is_valid (SANE_Pid pid);
 
+/** Invalidate a SANE_Pid
+ *
+ *  This "function" should be used to invalidate a SANE_Pid in a
+ *  portable manner.
+ *
+ *  @note
+ *  When using pthreads, this only works for those implementations
+ *  that opted to make pthread_t an arithmatic type.  This is *not*
+ *  required by the POSIX threads specification.  The choice to do
+ *  SANE_Pid invalidation by means of a macro rather than a proper
+ *  function circumvents to need to pass a pointer.
+ *  If we decide to implement SANE_Pid with a void* in the future,
+ *  this can be changed into a proper function without the need to
+ *  change existing code.
+ *
+ *  For details on the pthread_t type, see in particular Issue 6 of
+ *  http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html
+ */
+#define sanei_thread_invalidate(pid) ((pid) = (SANE_Pid)(-1))
+
+/** Initialize a SANE_Pid
+ *
+ *  This "function" should be used to initialize a SANE_Pid in a
+ *  portable manner.
+ *
+ *  @note
+ *  This is at present just an alias of sanei_thread_invalidate.
+ *  It seemed misleading to use the latter when intent clearly has
+ *  initialization written all over it, hence the alias.
+ */
+#define sanei_thread_initialize sanei_thread_invalidate
+
 /** Spawn a new task.
  *
  * This function should be used to start a new task.
@@ -131,7 +163,7 @@ extern int sanei_thread_kill (SANE_Pid pid);
  * @param pid - the id of the task
  * @param sig - the signal to send
  *
- * @return 
+ * @return
  * - 0 - on success
  * - any other value - if an error occured while sending the signal
  */
@@ -139,7 +171,7 @@ extern int sanei_thread_sendsig (SANE_Pid pid, int sig);
 
 /** Wait for task termination.
  *
- * This function waits until a task that has been terminated by 
+ * This function waits until a task that has been terminated by
  * sanei_thread_kill(), sanei_thread_sendsys() or by any other means
  * is finished.
  *
@@ -153,7 +185,7 @@ extern SANE_Pid sanei_thread_waitpid (SANE_Pid pid, int *status);
 
 /** Check the current status of the spawned task
  *
- * 
+ *
  * @param pid - the id of the task
  *
  * @return
diff --git a/include/sane/sanei_udp.h b/include/sane/sanei_udp.h
index e32fc1a..bee013a 100644
--- a/include/sane/sanei_udp.h
+++ b/include/sane/sanei_udp.h
@@ -12,7 +12,7 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Header file for UDP/IP communications. 
+ * Header file for UDP/IP communications.
  */
 
 #ifndef sanei_udp_h
diff --git a/include/sane/sanei_usb.h b/include/sane/sanei_usb.h
index c8fff97..ce389ca 100644
--- a/include/sane/sanei_usb.h
+++ b/include/sane/sanei_usb.h
@@ -68,6 +68,10 @@
 
 #include <stdlib.h> /* for size_t */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* USB spec defines */
 #ifndef USB_CLASS_PER_INTERFACE
 /* Also defined in libusb */
@@ -521,5 +525,9 @@ sanei_usb_set_altinterface (SANE_Int dn, SANE_Int alternate);
 extern SANE_Status
 sanei_usb_get_descriptor( SANE_Int dn, struct sanei_usb_dev_descriptor *desc );
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 /*------------------------------------------------------*/
 #endif /* sanei_usb_h */
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2019-07-31 17:00:20 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2019-07-31 17:00:20 +0200
commit	3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (patch)
tree	d69692a274dd1c7d0672e6bb7155a0fc106f9d49 /include
parent	c8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent	1687222e1b9e74c89cafbb5910e72d8ec7bfd40f (diff)