From 1edb02101a9306fc711cd422ed507d18165b1691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 15 Jul 2017 11:25:39 +0200 Subject: move from support/1.0.27 to feature/1.0.27 --- include/Makefile.in | 43 +++++++++++++++++++++++++-------- include/sane/config.h.in | 57 +++++++++++++++++++++++++++----------------- include/sane/sanei.h | 11 +++++++++ include/sane/sanei_backend.h | 24 ++++++++----------- include/sane/sanei_thread.h | 7 +++--- include/sane/sanei_udp.h | 3 +++ 6 files changed, 96 insertions(+), 49 deletions(-) (limited to 'include') diff --git a/include/Makefile.in b/include/Makefile.in index 45395a4..3ccbdf3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -82,11 +82,16 @@ 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/ltoptions.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)/acinclude.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/byteorder.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/configure.in + $(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 @@ -164,7 +169,10 @@ 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@ @@ -185,7 +193,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DISTCLEAN_FILES = @DISTCLEAN_FILES@ +DLH = @DLH@ DLLTOOL = @DLLTOOL@ DL_LIBS = @DL_LIBS@ DSYMUTIL = @DSYMUTIL@ @@ -198,34 +206,42 @@ 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@ -INCLUDES = @INCLUDES@ 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@ -LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@ -LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@ LIBV4L_CFLAGS = @LIBV4L_CFLAGS@ LIBV4L_LIBS = @LIBV4L_LIBS@ -LINKER_RPATH = @LINKER_RPATH@ LIPO = @LIPO@ LN_S = @LN_S@ LOCKPATH_GROUP = @LOCKPATH_GROUP@ +LTALLOCA = @LTALLOCA@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINDEX = @MAKEINDEX@ @@ -234,10 +250,10 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ -NUMBER_VERSION = @NUMBER_VERSION@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -250,10 +266,13 @@ 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@ @@ -275,12 +294,16 @@ 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@ diff --git a/include/sane/config.h.in b/include/sane/config.h.in index ace060c..9a90a8d 100644 --- a/include/sane/config.h.in +++ b/include/sane/config.h.in @@ -1,4 +1,4 @@ -/* include/sane/config.h.in. Generated from configure.in by autoheader. */ +/* include/sane/config.h.in. Generated from configure.ac by autoheader. */ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD @@ -11,15 +11,19 @@ /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA -/* Should we disable SCSI generic v3? */ -#undef DISABLE_LINUX_SG_IO - /* 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 @@ -46,9 +50,6 @@ /* Define to 1 if you have the `atexit' function. */ #undef HAVE_ATEXIT -/* Define to 1 if you have the header file. */ -#undef HAVE_BE_DRIVERS_USB_SCANNER_H - /* Define to 1 if you have the header file. */ #undef HAVE_BE_KERNEL_OS_H @@ -58,9 +59,21 @@ /* Define to 1 if you have the 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 header file. */ #undef HAVE_DDK_NTDDSCSI_H @@ -103,6 +116,9 @@ /* 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 @@ -112,9 +128,15 @@ /* 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 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 header file. */ #undef HAVE_IFADDRS_H @@ -177,11 +199,11 @@ /* Define to 1 if you have the net-snmp library. */ #undef HAVE_LIBSNMP -/* Define to 1 if you have libusb. */ +/* Define to 1 if you have libusb-1.0 */ #undef HAVE_LIBUSB -/* Define to 1 if you have libusb-1.0. */ -#undef HAVE_LIBUSB_1_0 +/* Define to 1 if you have libusb-0.1 */ +#undef HAVE_LIBUSB_LEGACY /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H @@ -252,9 +274,6 @@ /* define if you have the resmgr library */ #undef HAVE_RESMGR -/* Define to 1 if you have the header file. */ -#undef HAVE_SCDDS_H - /* Define to 1 if you have the `scsireq_enter' function. */ #undef HAVE_SCSIREQ_ENTER @@ -333,9 +352,6 @@ /* Is /usr/include/systemd/sd-daemon.h available? */ #undef HAVE_SYSTEMD -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_BITYPES_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_DSREQ_H @@ -454,7 +470,7 @@ */ #undef LT_OBJDIR -/* Define to the name of the distribution. */ +/* Name of package */ #undef PACKAGE /* Define to the address where bug reports for this package should be sent. */ @@ -475,9 +491,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* SANE DLL revision number */ #undef SANE_DLL_V_BUILD @@ -544,7 +557,7 @@ #endif -/* Define to the version of the distribution. */ +/* Version number of package */ #undef VERSION /* define if Avahi support is enabled for saned and the net backend */ @@ -593,7 +606,7 @@ /* Define socklen_t as \'int\' if necessary. */ #undef socklen_t -/* Define to `long' if does not define. */ +/* Define to `int' if does not define. */ #undef ssize_t /* Define for OS/2 only */ diff --git a/include/sane/sanei.h b/include/sane/sanei.h index ece1beb..9458f34 100644 --- a/include/sane/sanei.h +++ b/include/sane/sanei.h @@ -92,6 +92,9 @@ /** @name Public macros and functions * @{ */ +/** @def __sane_unused__ + * Mark parameters as potentially unused. + */ /** @def STRINGIFY(x) * Turn parameter into string. */ @@ -137,6 +140,14 @@ /* @} */ /* A few convenience macros: */ + +/** @hideinitializer */ +#ifdef __GNUC__ +#define __sane_unused__ __attribute__((unused)) +#else +#define __sane_unused__ +#endif + /** @hideinitializer */ #define NELEMS(a) ((int)(sizeof (a) / sizeof (a[0]))) diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h index 1b5afe2..8273e88 100644 --- a/include/sane/sanei_backend.h +++ b/include/sane/sanei_backend.h @@ -9,25 +9,21 @@ */ -/* - * Compiler related options - */ - -/** Mark unused variables/parameters - * - * Tells the compiler a variable is unused, so the compiler doesn't spit a warning. - */ -#ifdef __GNUC__ -#define __sane_unused__ __attribute__((unused)) -#else -#define __sane_unused__ -#endif - /** @name Compatibility macros * @{ */ #include +#if __STDC_VERSION__ >= 199901L +/* __func__ is provided */ +#elif __GNUC__ >= 5 +/* __func__ is provided */ +#elif __GNUC__ >= 2 +# define __func__ __FUNCTION__ +#else +# define __func__ "(unknown)" +#endif + #ifdef HAVE_SYS_HW_H /* OS/2 i/o-port access compatibility macros: */ # define inb(p) _inp8 (p) diff --git a/include/sane/sanei_thread.h b/include/sane/sanei_thread.h index f152c93..fa72481 100644 --- a/include/sane/sanei_thread.h +++ b/include/sane/sanei_thread.h @@ -61,6 +61,7 @@ #include "../include/sane/config.h" #ifdef USE_PTHREAD +#include typedef pthread_t SANE_Pid; #else typedef int SANE_Pid; @@ -88,10 +89,10 @@ extern SANE_Bool sanei_thread_is_forked (void); * regardless of SANE_Pid's data type. * * @return - * - SANE_TRUE - if pid is not a valid process - * - SANE_FALSE - if pid is a valid process + * - SANE_TRUE - if pid is a valid process + * - SANE_FALSE - if pid is not a valid process */ -extern SANE_Bool sanei_thread_is_invalid (SANE_Pid pid); +extern SANE_Bool sanei_thread_is_valid (SANE_Pid pid); /** Spawn a new task. * diff --git a/include/sane/sanei_udp.h b/include/sane/sanei_udp.h index c44afdd..e32fc1a 100644 --- a/include/sane/sanei_udp.h +++ b/include/sane/sanei_udp.h @@ -27,6 +27,9 @@ #include #include #endif +#ifdef HAVE_SYS_TYPES_H +#include +#endif extern SANE_Status sanei_udp_open(const char *host, int port, int *fdp); extern SANE_Status sanei_udp_open_broadcast(int *fdp); -- cgit v1.2.3