Merge branch '634-llvm-15-on-freebsd-support-for-sane-backends-1-1-1' into 'master'

Resolve "LLVM 15 on FreeBSD support for sane-backends 1.1.1"

Closes #634

See merge request sane-project/backends!777
release-1.2.x
Ralph Little 2023-01-07 07:48:17 +00:00
commit 7ee6327d3c
2 zmienionych plików z 8 dodań i 0 usunięć

Wyświetl plik

@ -201,7 +201,11 @@ static SANE_Int _get_current_time( struct tm *pt, SANE_Byte *sign_c, int *ptz_h,
goto EXIT;
}
/* get time difference ( OHH'mm' ) */
#ifdef __FreeBSD__
tz = -pt->tm_gmtoff;
#else
tz = timezone;
#endif
if ( tz > 0 ) {
*sign_c = '-';
}

Wyświetl plik

@ -40,6 +40,10 @@
#include <unistd.h>
#include <stdarg.h>
#ifdef __FreeBSD__
#include <libgen.h>
#endif
#if defined (__APPLE__) && defined (__MACH__)
#include <libgen.h> // for basename()
#endif