From patchwork Tue Jan 15 18:20:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 212288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 607072C00A4 for ; Wed, 16 Jan 2013 05:20:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756056Ab3AOSUH (ORCPT ); Tue, 15 Jan 2013 13:20:07 -0500 Received: from ares07.inai.de ([5.9.24.206]:38864 "EHLO ares07.inai.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756073Ab3AOSUG (ORCPT ); Tue, 15 Jan 2013 13:20:06 -0500 Received: by ares07.inai.de (Postfix, from userid 25121) id 1998396A0688; Tue, 15 Jan 2013 19:20:04 +0100 (CET) From: Jan Engelhardt To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH 1/2] build: fix libiptc build failure on old linux-glibc-devel headers Date: Tue, 15 Jan 2013 19:20:01 +0100 Message-Id: <1358274002-6042-2-git-send-email-jengelh@inai.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358274002-6042-1-git-send-email-jengelh@inai.de> References: <1358274002-6042-1-git-send-email-jengelh@inai.de> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Debian 3.1, compilation of libiptc fails with CC libip4tc.lo In file included from libip4tc.c:113: libiptc.c:93: error: field `list' has incomplete type This is because /usr/include/linux/list.h still existed at that time, but has all its definitions stashed in __KERNEL__. Switching linux_list.h's guards to another name resolves the problem. --- libiptc/linux_list.h | 4 ++-- libiptc/linux_stddef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libiptc/linux_list.h b/libiptc/linux_list.h index abdcf88..3a51185 100644 --- a/libiptc/linux_list.h +++ b/libiptc/linux_list.h @@ -1,5 +1,5 @@ -#ifndef _LINUX_LIST_H -#define _LINUX_LIST_H +#ifndef _IPTC_LIST_H +#define _IPTC_LIST_H #undef offsetof #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) diff --git a/libiptc/linux_stddef.h b/libiptc/linux_stddef.h index 56416f1..57758c9 100644 --- a/libiptc/linux_stddef.h +++ b/libiptc/linux_stddef.h @@ -1,5 +1,5 @@ -#ifndef _LINUX_STDDEF_H -#define _LINUX_STDDEF_H +#ifndef _IPTC_STDDEF_H +#define _IPTC_STDDEF_H #undef NULL #if defined(__cplusplus)