[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - desktop/unx

[Libreoffice Gerrit user]

 desktop/unx/source/pagein.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 11b4a0f2f2774be77a5c8f147ef2b2d2c08eb376
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Wed Mar 8 10:37:38 2017 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Nov 1 12:37:55 2018 +0100

    WaE: include needed header
    
    "error: In the GNU C Library, "major" is defined
    by <sys/sysmacros.h>. For historical compatibility, it is
    currently defined by <sys/types.h> as well, but we plan to
    remove this soon. To use "major", include <sys/sysmacros.h>
    directly. If you did not intend to use a system-defined macro
    "major", you should undefine it after including <sys/types.h>."
    
    Change-Id: I7f5741d4c2eae277e316c5fc97aa73b9430fbdc1
    (cherry picked from commit 01bf741a79241829b0d5c048e8f45e3cf6914d3e)
    Reviewed-on: https://gerrit.libreoffice.org/62721
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/desktop/unx/source/pagein.c b/desktop/unx/source/pagein.c
index 56baffa79ca3..a401419fc162 100644
--- a/desktop/unx/source/pagein.c
+++ b/desktop/unx/source/pagein.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 
 /* do_pagein */