From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- 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 +++ 5 files changed, 63 insertions(+), 39 deletions(-) (limited to 'include/sane') 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