[Libreoffice-commits] core.git: configure.ac desktop/unx

[Stephan Bergmann (via logerrit)]

 configure.ac                |    5 -----
 desktop/unx/source/pagein.c |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit e897fdc46b07f211c4c96de103cfa494b645035a
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Oct 15 10:28:12 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Oct 15 11:56:04 2020 +0200

    Fix check for inclusion of <sys/sysmacros.h>
    
    30a5d201144cba04dd708c11d87cc5517c04c0c3 "Do not include <sys/sysmacros.h>
    header unconditionally, but perform a check for it in the configure script" had
    added an AC_DEFINE without a corresponding mention in any
    config_host/config_*.h.in (we use AC_CONFIG_HEADERS), so the #ifdef was always
    false.
    
    The #include <sys/sysmacros.h> had been added with
    01bf741a79241829b0d5c048e8f45e3cf6914d3e "WaE: include needed header" for the
    declaration of a major function, but which is only used in #ifdef LINUX code
    anyway.
    
    Change-Id: I81b574c4a3e5fa2ef4e64a507b4841044217409b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104351
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 180200f0d2ee..7449a78f7962 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5289,11 +5289,6 @@ dnl Check for syslog header
 dnl ===================================================================
 AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H))
 
-dnl ===================================================================
-dnl Check for sysmacros header
-dnl ===================================================================
-AC_CHECK_HEADER(sys/sysmacros.h, AC_DEFINE(HAVE_SYS_SYSMACROS_H))
-
 dnl Set the ENABLE_WERROR variable. (Activate --enable-werror)
 dnl ===================================================================
 AC_MSG_CHECKING([whether to turn warnings to errors])
diff --git a/desktop/unx/source/pagein.c b/desktop/unx/source/pagein.c
index 2f42fd1df9dc..1dff59bd5143 100644
--- a/desktop/unx/source/pagein.c
+++ b/desktop/unx/source/pagein.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_SYSMACROS_H
+#ifdef LINUX
 #include <sys/sysmacros.h>
 #endif
 #include <sys/types.h>