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/sanei_backend.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'include/sane/sanei_backend.h') 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) -- cgit v1.2.3 From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- include/sane/sanei_backend.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'include/sane/sanei_backend.h') 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 -- cgit v1.2.3