From patchwork Sun Nov 22 18:33:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 9776 Received: (qmail 30672 invoked by alias); 22 Nov 2015 18:33:08 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 30648 invoked by uid 89); 22 Nov 2015 18:33:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.3 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, UNWANTED_LANGUAGE_BODY autolearn=no version=3.3.2 X-HELO: hall.aurel32.net From: Aurelien Jarno To: libc-alpha@sourceware.org Cc: Mike Frysinger Subject: [COMITTED 2.21] nscd: drop selinux/flask.h include Date: Sun, 22 Nov 2015 19:33:01 +0100 Message-Id: <1448217181-3704-1-git-send-email-aurelien@aurel32.net> From: Mike Frysinger Building nscd w/selinux enabled yields a warning which yields an error: In file included from selinux.c:32:0: /usr/include/selinux/flask.h:5:2: error: #warning "Please remove any #include's of this header in your source code." I've done just that and it builds cleanly with libselinux-2.4. (cherry picked from commit 808696696837b8b8fc858f2e6f8d4e40e26e1308) --- ChangeLog | 4 ++++ nscd/selinux.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 868d355..079b411 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-07-08 Mike Frysinger + + * nscd/selinux.c: Delete selinux/flask.h include. + 2015-03-02 Andreas Schwab * elf/Makefile ($(elf-objpfx)runtime-linker.st): Fix typo in diff --git a/nscd/selinux.c b/nscd/selinux.c index e433b1b..806763f 100644 --- a/nscd/selinux.c +++ b/nscd/selinux.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #ifdef HAVE_LIBAUDIT # include