From patchwork Sat Oct 26 18:50:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Cernekee X-Patchwork-Id: 286301 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 1DD082C00DC for ; Sun, 27 Oct 2013 05:50:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753344Ab3JZSus (ORCPT ); Sat, 26 Oct 2013 14:50:48 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:62828 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753199Ab3JZSus (ORCPT ); Sat, 26 Oct 2013 14:50:48 -0400 Received: by mail-pa0-f45.google.com with SMTP id kp14so5158438pab.4 for ; Sat, 26 Oct 2013 11:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5ZPkCq5gCRMuWpN8Zqv8bVS+yfXEDSF+nAlRe5HAFEE=; b=RDIJnn8DV2mvBc6UlnXYXOnYf9KiUsR3Tab5YkUil5pAfih9jNjkFgxjYqJyGYqC8l WRP6hWb7aPSjENixdmrmvLflRbFjt9yL3URx437UnhhnXfv7BTq+mGNVghghL+90tz3P ugdl72A9dwqd3qR+/iS/MiJ20Gq2jV1+1wmIhAN2xdiUJlugk6ukX+RJT+2T9GqFXJ6R MJZ17Tasxx2Yili9Z3no5U28Wg+2pEqVeKEvMcZO3puMi1I9pOqFu3C7bErWMxSiU9WJ axIf4i0g8bu6nFavC0jJe/0BfC/jxaL2jGsrd7gyWl4VCNbkBPKA4tcHrzgLEnmQOIuz Pfcg== X-Received: by 10.66.139.38 with SMTP id qv6mr17198479pab.59.1382813447845; Sat, 26 Oct 2013 11:50:47 -0700 (PDT) Received: from localhost ([69.194.165.145]) by mx.google.com with ESMTPSA id yo2sm22635980pab.8.2013.10.26.11.50.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Oct 2013 11:50:47 -0700 (PDT) From: Kevin Cernekee To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH iptables 2/3] android: Don't include conflicting headers Date: Sat, 26 Oct 2013 11:50:32 -0700 Message-Id: <1382813433-20890-3-git-send-email-cernekee@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1382813433-20890-1-git-send-email-cernekee@gmail.com> References: <1382813433-20890-1-git-send-email-cernekee@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org and redefine a couple of structs, including iphdr. Handle this the same way as on glibc, i.e. don't include . This change comes from AOSP. Signed-off-by: Kevin Cernekee --- include/libiptc/ipt_kernel_headers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h index 18861fe..60c7998 100644 --- a/include/libiptc/ipt_kernel_headers.h +++ b/include/libiptc/ipt_kernel_headers.h @@ -5,7 +5,7 @@ #include -#if defined(__GLIBC__) && __GLIBC__ == 2 +#if defined(__ANDROID__) || (defined(__GLIBC__) && __GLIBC__ == 2) #include #include #include