Merge branch 'macos10.15-compile-fixes' into 'master'

Compile fixes for macOS 10.15 and later See merge request sane-project/frontends!8
Update .gitlab-ci.yml file
2023-02-12 02:03:23 +00:00 · 2023-02-12 01:56:48 +00:00 · 2023-02-11 16:27:26 +01:00
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -11,7 +11,7 @@ stages:

 archive:
  stage: archive
-  image: $REGISTRY_HUB:debian-8-full
+  image: $REGISTRY_HUB:debian-buster-full
  before_script:
  - apt-get update --quiet
  - apt-get install --quiet --assume-yes libsane-dev
--- a/sanei/sanei_init_debug.c
+++ b/sanei/sanei_init_debug.c
@ -100,7 +100,8 @@ sanei_debug_msg

  if (max_level >= level)
    {
-      if ( 1 == isfdtype(fileno(stderr), S_IFSOCK) )
+      struct stat sb;
+      if ( 0 == fstat(fileno(stderr), &sb) && S_IFSOCK == (sb.st_mode & S_IFMT) )
        {
          msg = (char *)malloc (sizeof(char) * (strlen(be) + strlen(fmt) + 4));
          if (msg == NULL)
Autor	SHA1	Wiadomość	Data
Ralph Little	a7fec47bec	Merge branch 'macos10.15-compile-fixes' into 'master' Compile fixes for macOS 10.15 and later See merge request sane-project/frontends!8	2023-02-12 02:03:23 +00:00
Ralph Little	e25307a8a7	Update .gitlab-ci.yml file	2023-02-12 01:56:48 +00:00
Michael Klein	c33752c719	sanei: replace non-portable isfdtype() with fstat()	2023-02-11 16:27:26 +01:00